Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(747)

Unified Diff: ui/views/controls/menu/menu_controller_unittest.cc

Issue 1647933002: ash/wm: Remove dead code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/views/controls/menu/menu_message_loop_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_controller_unittest.cc
diff --git a/ui/views/controls/menu/menu_controller_unittest.cc b/ui/views/controls/menu/menu_controller_unittest.cc
index e9074f0704e4194f64d44dbd7f7e0a96a36cac9f..ef14d10ca87f94dda436b16e986da0fb81b5743e 100644
--- a/ui/views/controls/menu/menu_controller_unittest.cc
+++ b/ui/views/controls/menu/menu_controller_unittest.cc
@@ -24,10 +24,6 @@
#include "ui/views/controls/menu/submenu_view.h"
#include "ui/views/test/views_test_base.h"
-#if defined(OS_WIN)
-#include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
-#endif
-
#if defined(USE_AURA)
#include "ui/aura/scoped_window_targeter.h"
#include "ui/aura/window.h"
@@ -436,14 +432,7 @@ class MenuControllerTest : public ViewsTestBase {
new ui::test::EventGenerator(GetContext(), owner_->GetNativeWindow()));
owner_->Show();
-#if defined(OS_WIN)
- dispatcher_client_.reset(new DesktopDispatcherClient);
- aura::client::SetDispatcherClient(owner_->GetNativeView()->GetRootWindow(),
- dispatcher_client_.get());
-#endif
-
SetupMenuItem();
-
SetupMenuController();
}
@@ -467,10 +456,6 @@ class MenuControllerTest : public ViewsTestBase {
menu_item_->SetController(menu_controller_);
}
-#if defined(OS_WIN)
- scoped_ptr<aura::client::DispatcherClient> dispatcher_client_;
-#endif
-
scoped_ptr<Widget> owner_;
scoped_ptr<ui::test::EventGenerator> event_generator_;
scoped_ptr<TestMenuItemViewShown> menu_item_;
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/views/controls/menu/menu_message_loop_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698