chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc - Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

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

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 5 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/options2/chromeos/accounts_options_handler.cc ('k') | chrome/browser/ui/webui/options2/chromeos/internet_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 86d266f8346214031fefe2b251b7e52f3fa490a6..77961b80096b2ac7d93379e026d9ee9c165e8d4d 100644

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

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

@@ -11,10 +11,10 @@

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/browser_process.h"

-#include "chrome/browser/chromeos/cros_settings.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/proxy_config_service_impl.h"

#include "chrome/browser/chromeos/proxy_cros_settings_parser.h"

+#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/policy/browser_policy_connector.h"

#include "chrome/browser/prefs/pref_set_observer.h"

#include "chrome/browser/profiles/profile.h"