chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc - Issue 684143003: Make chrome/browser/ui/webui not depend on ash when using Athena

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

Issue 684143003: Make chrome/browser/ui/webui not depend on ash when using Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash43_kiosk_mode

Patch Set: Created 6 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

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

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

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

index 771fdeccd918394017ff15e9c17bf671005e0cae..e6014c4040c1ee298f338549d729315af193af16 100644

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

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

@@ -6,8 +6,6 @@

#include <string>

-#include "ash/session/session_state_delegate.h"

-#include "ash/shell.h"

#include "base/bind.h"

#include "base/prefs/pref_change_registrar.h"

#include "base/strings/string_number_conversions.h"

@@ -33,6 +31,11 @@

#include "content/public/browser/web_ui.h"

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

+#if !defined(USE_ATHENA)

Evan Stade 2014/10/31 18:27:12 why not USE_ASH?

+#include "ash/session/session_state_delegate.h"

+#include "ash/shell.h"

+#endif

namespace chromeos {

namespace options {