chrome/browser/ui/webui/options/chromeos/display_overscan_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: chrome/browser/ui/webui/options/chromeos/display_overscan_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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/display_options_handler.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc

index a6f09483f1a05eaf1eea269675be78507c59497e..c176b0b0ca89cca60a61423176d420d807344d72 100644

--- a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc

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

#include <string>

#include "ash/display/display_controller.h"

-#include "ash/screen_ash.h"

+#include "ash/screen_util.h"

#include "ash/shell.h"

#include "base/bind.h"

#include "base/logging.h"

@@ -18,6 +18,7 @@

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/gfx/display.h"

+#include "ui/gfx/screen.h"

namespace chromeos {

namespace options {

@@ -108,7 +109,7 @@ void DisplayOverscanHandler::HandleStart(const base::ListValue* args) {

return;

}

- const gfx::Display& display = ash::ScreenAsh::GetDisplayForId(display_id);

+ const gfx::Display& display = ash::ScreenUtil::GetDisplayForId(display_id);

DCHECK(display.is_valid());

if (!display.is_valid())

return;