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

Unified Diff: ui/views/widget/native_widget_aura.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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
Index: ui/views/widget/native_widget_aura.cc
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 8366092e9a4f2a8f89261bba64a50c9842679dac..dd2f7e84a9179da0ef9d9e90825b25d2fe6cd547 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -276,7 +276,7 @@ bool NativeWidgetAura::HasCapture() const {
InputMethod* NativeWidgetAura::CreateInputMethod() {
if (!window_)
return NULL;
- aura::RootWindow* root_window = window_->GetRootWindow();
+ aura::Window* root_window = window_->GetRootWindow();
ui::InputMethod* host =
root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
return new InputMethodBridge(this, host, true);
@@ -391,7 +391,7 @@ void NativeWidgetAura::SetBounds(const gfx::Rect& bounds) {
if (!window_)
return;
- aura::RootWindow* root = window_->GetRootWindow();
+ aura::Window* root = window_->GetRootWindow();
if (root) {
aura::client::ScreenPositionClient* screen_position_client =
aura::client::GetScreenPositionClient(root);
@@ -523,7 +523,7 @@ bool NativeWidgetAura::IsActive() const {
// We may up here during destruction of the root, in which case
// GetRootWindow() returns NULL (~RootWindow() has run and we're in ~Window).
- aura::RootWindow* root = window_->GetRootWindow();
+ aura::Window* root = window_->GetRootWindow();
return root &&
aura::client::GetActivationClient(root)->GetActiveWindow() == window_;
}
@@ -1118,7 +1118,7 @@ void NativeWidgetPrivate::ReparentNativeView(gfx::NativeView native_view,
// in this case is the stacking client of the current RootWindow. This
// matches our previous behaviour; the global stacking client would almost
// always reattach the window to the same RootWindow.
- aura::RootWindow* root_window = native_view->GetRootWindow();
+ aura::Window* root_window = native_view->GetRootWindow();
aura::client::ParentWindowWithContext(
native_view, root_window, root_window->GetBoundsInScreen());
}
« no previous file with comments | « ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc ('k') | ui/views/widget/tooltip_manager_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698