chrome/browser/ui/views/apps/native_app_window_views.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: chrome/browser/ui/views/apps/native_app_window_views.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: chrome/browser/ui/views/apps/native_app_window_views.cc

diff --git a/chrome/browser/ui/views/apps/native_app_window_views.cc b/chrome/browser/ui/views/apps/native_app_window_views.cc

index 7073fa101ca2b2d8cbee7d26bc8bc06881f255a4..3b66ed638898b8a1cb0b3b21f9aeef95b51b0951 100644

--- a/chrome/browser/ui/views/apps/native_app_window_views.cc

+++ b/chrome/browser/ui/views/apps/native_app_window_views.cc

@@ -48,7 +48,7 @@

#if defined(USE_ASH)

#include "ash/ash_constants.h"

#include "ash/ash_switches.h"

-#include "ash/screen_ash.h"

+#include "ash/screen_util.h"

#include "ash/shell.h"

#include "ash/wm/custom_frame_view_ash.h"

#include "ash/wm/immersive_fullscreen_controller.h"

@@ -361,7 +361,7 @@ void NativeAppWindowViews::InitializePanelWindow(

if (ash::Shell::HasInstance()) {

// Open a new panel on the target root.

aura::Window* target = ash::Shell::GetTargetRootWindow();

- params.bounds = ash::ScreenAsh::ConvertRectToScreen(

+ params.bounds = ash::ScreenUtil::ConvertRectToScreen(

target, gfx::Rect(preferred_size_));

} else {

params.bounds = gfx::Rect(preferred_size_);