ash/shelf/shelf.cc - Issue 138003007: [Cleanup] Screen cleanup

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/shelf/shelf.cc

Issue 138003007: [Cleanup] Screen cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: make sure screen_for_shutdown is reset everytime Created 6 years, 11 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/shelf/shelf.cc

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

index e0168750024cce6a07e7bdbce6babbc2fdf80bfd..51a90d130e110d45ff00c76eb91eb517e222600c 100644

--- a/ash/shelf/shelf.cc

+++ b/ash/shelf/shelf.cc

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

#include "ash/focus_cycler.h"

#include "ash/root_window_controller.h"

-#include "ash/screen_ash.h"

+#include "ash/screen_util.h"

#include "ash/shelf/shelf_delegate.h"

#include "ash/shelf/shelf_item_delegate.h"

#include "ash/shelf/shelf_item_delegate_manager.h"

@@ -95,7 +95,7 @@ gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(aura::Window* window) {

void Shelf::UpdateIconPositionForWindow(aura::Window* window) {

shelf_view_->UpdatePanelIconPosition(

GetLauncherIDForWindow(window),

- ScreenAsh::ConvertRectFromScreen(

+ ScreenUtil::ConvertRectFromScreen(

shelf_widget()->GetNativeView(),

window->GetBoundsInScreen()).CenterPoint());

}

« no previous file with comments | « ash/screen_util_unittest.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »