chrome/browser/ui/webui/options/chromeos/display_options_handler.cc - Issue 2355063002: Separate ash::test::DisplayManagerTestApi from ash

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_options_handler.cc

Issue 2355063002: Separate ash::test::DisplayManagerTestApi from ash (Closed)

Patch Set: review comments Created 4 years, 2 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/ash/system_tray_delegate_chromeos_browsertest_chromeos.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_options_handler.cc

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

index c9cf900fe98919d87178715576e7ff11e7869501..bf5df4a7a2e00fd5684721db3fc9dadad5c5cb1f 100644

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

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

@@ -16,7 +16,8 @@

#include "ash/display/display_manager.h"

#include "ash/display/resolution_notification_controller.h"

#include "ash/display/window_tree_host_manager.h"

-#include "ash/screen_util.h"

+//#include "ash/screen_util.h"

achuithb 2016/10/05 02:38:10 What's this?

rjkroege 2016/10/05 19:07:31 bad rebase. Fixed.

+#include "ash/shell.h"

#include "ash/shell.h"

#include "base/bind.h"

#include "base/command_line.h"