ash/screen_ash.cc - Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher()

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: ash/screen_ash.cc

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 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: ash/screen_ash.cc

diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc

index 4c7e1db3f48c260bebbb97b0ba6e713e5c54e702..41053bd70a5acc49f77b35c71c6ac2898bab72e6 100644

--- a/ash/screen_ash.cc

+++ b/ash/screen_ash.cc

@@ -6,7 +6,9 @@

#include "ash/display/display_controller.h"

#include "ash/display/multi_display_manager.h"

+#include "ash/root_window_controller.h"

#include "ash/shell.h"

+#include "ash/wm/property_util.h"

#include "ash/wm/coordinate_conversion.h"

#include "ash/wm/shelf_layout_manager.h"

#include "base/logging.h"

@@ -39,7 +41,7 @@ gfx::Display ScreenAsh::FindDisplayContainingPoint(const gfx::Point& point) {

// static

gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) {

- if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())

+ if (GetRootWindowController(window->GetRootWindow())->launcher())

return GetDisplayWorkAreaBoundsInParent(window);

else

return GetDisplayBoundsInParent(window);

« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.h » ('j') | no next file with comments »