chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 2072013002: mash: Move tray settings and deps to common.

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/browser_options_handler.cc

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. Created 4 years, 6 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/webui/options/browser_options_handler.cc

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

index 7c2be99202bfc08ad3e97017b7630e7667c5eedb..0d435e0504cf8541257dbcc3006b51eae478ee51 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.cc

+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -112,9 +112,9 @@

#if defined(OS_CHROMEOS)

#include "ash/ash_switches.h"

+#include "ash/common/system/chromeos/devicetype_utils.h"

#include "ash/desktop_background/user_wallpaper_delegate.h"

#include "ash/shell.h"

-#include "ash/system/chromeos/devicetype_utils.h"

#include "chrome/browser/browser_process_platform_part.h"

#include "chrome/browser/chromeos/accessibility/accessibility_util.h"

#include "chrome/browser/chromeos/arc/arc_auth_service.h"