chrome/browser/ui/views/apps/native_app_window_views.cc - Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/apps/native_app_window_views.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:

Index: chrome/browser/ui/views/apps/native_app_window_views.cc

diff --git a/chrome/browser/ui/views/apps/native_app_window_views.cc b/chrome/browser/ui/views/apps/native_app_window_views.cc

index 215eae927bff86bd9ea924ffea7e4c9095170f03..d5d39fd972f89ea464974c3224b1967934312c08 100644

--- a/chrome/browser/ui/views/apps/native_app_window_views.cc

+++ b/chrome/browser/ui/views/apps/native_app_window_views.cc

@@ -49,7 +49,6 @@

#include "chrome/browser/ui/ash/ash_util.h"

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/client/window_tree_client.h"

-#include "ui/aura/root_window.h"

#include "ui/aura/window.h"

#endif

@@ -268,7 +267,7 @@ void NativeAppWindowViews::InitializePanelWindow(

#if defined(USE_ASH)

if (ash::Shell::HasInstance()) {

// Open a new panel on the target root.

- aura::RootWindow* target = ash::Shell::GetTargetRootWindow();

+ aura::Window* target = ash::Shell::GetTargetRootWindow();

params.bounds = ash::ScreenAsh::ConvertRectToScreen(

target, gfx::Rect(preferred_size_));

} else {