chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc - Issue 2314853003: Move ash::DisplayManager switches to ui::display

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/ash/launcher/chrome_launcher_controller_impl_unittest.cc

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)

Patch Set: rebased again Created 4 years, 3 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/launcher/chrome_launcher_controller_impl_browsertest.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

index edb5a2618b14de2a97c546db1e28701dfb17aa83..03bcef8310b046038be651ffc4a32342857442ee 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

@@ -100,6 +100,7 @@

#include "ui/aura/window.h"

#include "ui/base/models/menu_model.h"

#include "ui/display/display.h"

+#include "ui/display/display_switches.h"

#include "ui/display/screen.h"

#include "ui/views/widget/widget.h"

@@ -314,7 +315,7 @@ class ChromeLauncherControllerImplTest : public BrowserWithTestWindowTest {

void SetUp() override {

base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();

- command_line->AppendSwitch(ash::switches::kAshUseFirstDisplayAsInternal);

+ command_line->AppendSwitch(switches::kUseFirstDisplayAsInternal);

command_line->AppendSwitch(ash::switches::kAshEnableTouchViewTesting);

app_list::AppListSyncableServiceFactory::SetUseInTesting();