ash/wm/gestures/system_pinch_handler.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/wm/gestures/system_pinch_handler.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/wm/gestures/system_pinch_handler.cc

diff --git a/ash/wm/gestures/system_pinch_handler.cc b/ash/wm/gestures/system_pinch_handler.cc

index 981dc24a77e0b50a7e17108e48ffd11936e60909..f1e0ffda27d5d60ba54ff5b883815eead2418a0b 100644

--- a/ash/wm/gestures/system_pinch_handler.cc

+++ b/ash/wm/gestures/system_pinch_handler.cc

@@ -4,7 +4,7 @@

#include "ash/wm/gestures/system_pinch_handler.h"

-#include "ash/screen_ash.h"

+#include "ash/screen_util.h"

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

@@ -114,9 +114,9 @@ gfx::Rect SystemPinchHandler::GetPhantomWindowScreenBounds(

const gfx::Point& point) {

if (pinch_factor_ > kPinchThresholdForMaximize) {

phantom_state_ = PHANTOM_WINDOW_MAXIMIZED;

- return ScreenAsh::ConvertRectToScreen(

+ return ScreenUtil::ConvertRectToScreen(

target_->parent(),

- ScreenAsh::GetMaximizedWindowBoundsInParent(target_));

+ ScreenUtil::GetMaximizedWindowBoundsInParent(target_));

}

if (pinch_factor_ < kPinchThresholdForMinimize) {

« no previous file with comments | « ash/wm/drag_window_resizer.cc ('k') | ash/wm/immersive_fullscreen_controller_unittest.cc » ('j') | no next file with comments »