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

Unified Diff: chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc

Issue 2577963006: Revert of Converts chrome to aura-mus (Closed)
Patch Set: Created 4 years 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
Index: chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc
diff --git a/chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc b/chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc
index bfe45c53900c51b0b76adad9a79b967f0600e613..0163441c450406a9af99614869a652b6e174eb4b 100644
--- a/chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc
@@ -9,8 +9,8 @@
#include "ui/app_list/views/app_list_view.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
-#include "ui/views/mus/mus_client.h"
-#include "ui/views/mus/pointer_watcher_event_router2.h"
+#include "ui/views/mus/pointer_watcher_event_router.h"
+#include "ui/views/mus/window_manager_connection.h"
namespace {
@@ -80,14 +80,16 @@
}
void AppListPresenterDelegateMus::OnShown(int64_t display_id) {
- views::MusClient::Get()->pointer_watcher_event_router()->AddPointerWatcher(
- this, false);
+ views::WindowManagerConnection::Get()
+ ->pointer_watcher_event_router()
+ ->AddPointerWatcher(this, false);
DCHECK(presenter_->GetTargetVisibility());
}
void AppListPresenterDelegateMus::OnDismissed() {
- views::MusClient::Get()->pointer_watcher_event_router()->RemovePointerWatcher(
- this);
+ views::WindowManagerConnection::Get()
+ ->pointer_watcher_event_router()
+ ->RemovePointerWatcher(this);
DCHECK(!presenter_->GetTargetVisibility());
}
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698