chrome/browser/ui/webui/options2/chromeos/internet_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/internet_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

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

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

index cef77662dde66cd298defcd8fdedc84ead595e46..09dbe3900dea19e75536e99958eacc228c16238f 100644

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

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

@@ -29,11 +29,11 @@

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/network_library.h"

#include "chrome/browser/chromeos/cros/onc_constants.h"

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

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

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

#include "chrome/browser/chromeos/options/network_config_view.h"

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

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

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

#include "chrome/browser/chromeos/status/network_menu_icon.h"

#include "chrome/browser/net/pref_proxy_config_tracker.h"

@@ -54,8 +54,8 @@

#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

#include "grit/theme_resources.h"

-#include "ui/base/layout.h"

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

+#include "ui/base/layout.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/display.h"

#include "ui/gfx/image/image_skia.h"

« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »