ash/wm/caption_buttons/alternate_frame_size_button.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/caption_buttons/alternate_frame_size_button.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/caption_buttons/alternate_frame_size_button.cc

diff --git a/ash/wm/caption_buttons/alternate_frame_size_button.cc b/ash/wm/caption_buttons/alternate_frame_size_button.cc

index dc3a61454d482261bde1eb43b1c0345b586f45ac..66ff4b16c7154dcdac18e7ddca2d4c3a804399b0 100644

--- a/ash/wm/caption_buttons/alternate_frame_size_button.cc

+++ b/ash/wm/caption_buttons/alternate_frame_size_button.cc

@@ -5,7 +5,7 @@

#include "ash/wm/caption_buttons/alternate_frame_size_button.h"

#include "ash/metrics/user_metrics_recorder.h"

-#include "ash/screen_ash.h"

+#include "ash/screen_util.h"

#include "ash/shell.h"

#include "ash/touch/touch_uma.h"

#include "ash/wm/window_state.h"

@@ -191,7 +191,7 @@ void AlternateFrameSizeButton::UpdatePressedButton(

snap_type_ == SNAP_LEFT ?

SnapSizer::LEFT_EDGE : SnapSizer::RIGHT_EDGE,

SnapSizer::OTHER_INPUT);

- phantom_window_controller_->Show(ScreenAsh::ConvertRectToScreen(

+ phantom_window_controller_->Show(ScreenUtil::ConvertRectToScreen(

frame_->GetNativeView()->parent(),

snap_sizer.target_bounds()));

} else {