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

Unified Diff: chrome/browser/ui/views/tabs/window_finder_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
« no previous file with comments | « chrome/browser/ui/views/status_bubble_views.cc ('k') | chrome/test/base/mash_browser_tests_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/window_finder_mus.cc
diff --git a/chrome/browser/ui/views/tabs/window_finder_mus.cc b/chrome/browser/ui/views/tabs/window_finder_mus.cc
index d97cfb44923a693bf115427c82cd5562ca377697..44614f52fce0d0505675428538ad295e0f16ef8d 100644
--- a/chrome/browser/ui/views/tabs/window_finder_mus.cc
+++ b/chrome/browser/ui/views/tabs/window_finder_mus.cc
@@ -6,9 +6,9 @@
#include "content/public/common/service_manager_connection.h" // nogncheck
#include "services/service_manager/runner/common/client_util.h" // nogncheck
-#include "ui/aura/mus/window_tree_client.h"
#include "ui/aura/window.h"
-#include "ui/views/mus/mus_client.h"
+#include "ui/views/mus/native_widget_mus.h"
+#include "ui/views/mus/window_manager_connection.h"
bool GetLocalProcessWindowAtPointMus(
const gfx::Point& screen_point,
@@ -20,14 +20,14 @@
if (!service_manager_connection || !service_manager::ServiceManagerIsRemote())
return false;
- std::set<aura::Window*> root_windows =
- views::MusClient::Get()->window_tree_client()->GetRoots();
+ std::set<ui::Window*> mus_windows =
+ views::WindowManagerConnection::Get()->GetRoots();
// TODO(erg): Needs to deal with stacking order here.
// For every mus window, look at the associated aura window and see if we're
// in that.
- for (aura::Window* root : root_windows) {
- views::Widget* widget = views::Widget::GetWidgetForNativeView(root);
+ for (ui::Window* mus : mus_windows) {
+ views::Widget* widget = views::NativeWidgetMus::GetWidgetForWindow(mus);
if (widget && widget->GetWindowBoundsInScreen().Contains(screen_point)) {
aura::Window* content_window = widget->GetNativeWindow();
« no previous file with comments | « chrome/browser/ui/views/status_bubble_views.cc ('k') | chrome/test/base/mash_browser_tests_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698