chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc - Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc

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

Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix nits Created 7 years, 7 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/options/browser_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9fe83b6d1d031e8bc35253e5f7366ffc52d2380f..c3349d444f2ee165c3e482928fe636b56d619356 100644

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

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

@@ -46,8 +46,8 @@

#include "chrome/browser/ui/host_desktop.h"

#include "chrome/browser/ui/singleton_tabs.h"

#include "chrome/common/chrome_notification_types.h"

-#include "chrome/common/chrome_switches.h"

#include "chrome/common/time_format.h"

+#include "chromeos/chromeos_switches.h"

#include "chromeos/network/network_ip_config.h"

#include "chromeos/network/network_util.h"

#include "chromeos/network/onc/onc_constants.h"

@@ -1347,7 +1347,7 @@ void InternetOptionsHandler::PopulateIPConfigsCallback(

bool staticIPConfig = type == chromeos::TYPE_ETHERNET ||

(type == chromeos::TYPE_WIFI &&

CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableStaticIPConfig));

+ chromeos::switches::kEnableStaticIPConfig));

dictionary.SetBoolean(kTagShowStaticIPConfig, staticIPConfig);

dictionary.SetBoolean(kTagShowPreferred,

@@ -1463,7 +1463,7 @@ void InternetOptionsHandler::PopulateCellularDetails(

DictionaryValue* dictionary) {

dictionary->SetBoolean(kTagCarrierSelectFlag,

CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableCarrierSwitching));

+ chromeos::switches::kEnableCarrierSwitching));

// Cellular network / connection settings.

dictionary->SetString(kTagServiceName, cellular->name());

dictionary->SetString(kTagNetworkTechnology,

@@ -1533,7 +1533,7 @@ void InternetOptionsHandler::PopulateCellularDetails(

cellular_property_ui_data);

if (CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableCarrierSwitching)) {

+ chromeos::switches::kEnableCarrierSwitching)) {

base::ListValue* supported_carriers = device->supported_carriers();

if (supported_carriers) {

dictionary->Set(kTagCarriers, supported_carriers->DeepCopy());