ash/screen_ash.cc - Issue 12313118: Refactor: Shelf Widget

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 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: safer shutdown (status_area_widget_) Created 7 years, 9 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 4635ed67dfd0b00e809c1bb562e26ff4350b7d3d..aabd5b67df73a1364bbac64071741e10ee59e5f9 100644

--- a/ash/screen_ash.cc

+++ b/ash/screen_ash.cc

@@ -7,10 +7,11 @@

#include "ash/display/display_controller.h"

#include "ash/display/display_manager.h"

#include "ash/root_window_controller.h"

+#include "ash/shelf/shelf_layout_manager.h"

+#include "ash/shelf/shelf_widget.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"

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

#include "ui/aura/env.h"

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

// static

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

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

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

return GetDisplayWorkAreaBoundsInParent(window);

else

return GetDisplayBoundsInParent(window);

« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/screen_ash_unittest.cc » ('j') | no next file with comments »