Skip to content

Commit

Permalink
Revert of views/mus: Fix showing menu in chrome in mus. (patchset chr…
Browse files Browse the repository at this point in the history
…omium#2 id:20001 of https://codereview.chromium.org/1460003004/ )

Reason for revert:
Suspected in build failure. see crbug.com/560461

Original issue's description:
> views/mus: Fix showing menu in chrome in mus.
>
> For menus in chrome-in-mus, we attempt to create a Widget hosted in a native
> window. For desktop builds, this means we attempt to host in a HWND or an
> X11 window created by DesktopNativeWidgetAura. But for mus, we want to use
> NativeWidgetMus. To do this, use the native-widget factory first if it's
> available.
>
> BUG=none
>
> Committed: https://crrev.com/2914df72a605451828a05e108c35fe9a1d72c971
> Cr-Commit-Position: refs/heads/master@{#361151}

TBR=sky@chromium.org,jam@chromium.org,sadrul@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

Review URL: https://codereview.chromium.org/1472873003

Cr-Commit-Position: refs/heads/master@{#361163}
  • Loading branch information
philippebeaudoin authored and Commit bot committed Nov 23, 2015
1 parent 35b0cd2 commit 25c81fc
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 13 deletions.
5 changes: 0 additions & 5 deletions base/threading/thread_restrictions.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ namespace ui {
class WindowResizeHelperMac;
}

namespace views {
class WindowManagerConnection;
}

namespace base {

namespace android {
Expand Down Expand Up @@ -224,7 +220,6 @@ class BASE_EXPORT ThreadRestrictions {
friend class ::NativeBackendKWallet; // http://crbug.com/125331
#if !defined(OFFICIAL_BUILD)
friend class content::SoftwareOutputDeviceMus; // Interim non-production code
friend class views::WindowManagerConnection;
#endif
// END USAGE THAT NEEDS TO BE FIXED.

Expand Down
6 changes: 1 addition & 5 deletions chrome/browser/ui/views/chrome_views_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
#include "chrome/browser/ui/ash/ash_util.h"
#endif


// Helpers --------------------------------------------------------------------

namespace {
Expand Down Expand Up @@ -353,11 +354,6 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
}
}
#endif // OS_WIN

if (!use_non_toplevel_window && !native_widget_factory().is_null()) {
params->native_widget = native_widget_factory().Run(*params, delegate);
return;
}
#endif // USE_AURA

#if defined(OS_CHROMEOS)
Expand Down
3 changes: 0 additions & 3 deletions ui/views/mus/window_manager_connection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "base/lazy_instance.h"
#include "base/threading/thread_local.h"
#include "base/threading/thread_restrictions.h"
#include "components/mus/public/cpp/window_tree_connection.h"
#include "components/mus/public/interfaces/window_tree.mojom.h"
#include "mojo/application/public/cpp/application_connection.h"
Expand Down Expand Up @@ -112,8 +111,6 @@ mus::Window* WindowManagerConnection::NewWindow(
window_manager_->OpenWindow(
window_tree_client.Pass(),
mojo::Map<mojo::String, mojo::Array<uint8_t>>::From(properties));

base::ThreadRestrictions::ScopedAllowWait allow_wait;
mus::WindowTreeConnection* window_tree_connection =
mus::WindowTreeConnection::Create(
this, window_tree_client_request.Pass(),
Expand Down

0 comments on commit 25c81fc

Please sign in to comment.