chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc - Issue 535283002: Translate activation/romaing state, restricted pool

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 535283002: Translate activation/romaing state, restricted pool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_279351_internet_options_7b

Patch Set: Only set RestrictedConnectivity if true, fix tests Created 6 years, 3 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/resources/options/chromeos/internet_detail.js ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.h » ('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 91fdc84c65d2a95ecde021ad59003670e9efc18b..29b4c103f34c4b9c36925a338424cf1bfba06604 100644

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

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

@@ -125,7 +125,6 @@ const char kShowMorePlanInfoMessage[] = "showMorePlanInfo";

// These are strings used to communicate with JavaScript.

const char kTagActivate[] = "activate";

-const char kTagActivationState[] = "activationState";

const char kTagAddConnection[] = "add";

const char kTagCarrierSelectFlag[] = "showCarrierSelect";

const char kTagCarrierUrl[] = "carrierUrl";

@@ -147,8 +146,6 @@ const char kTagRecommended[] = "recommended";

const char kTagRecommendedValue[] = "recommendedValue";

const char kTagRemembered[] = "remembered";

const char kTagRememberedList[] = "rememberedList";

-const char kTagRestrictedPool[] = "restrictedPool";

-const char kTagRoamingState[] = "roamingState";

const char kTagCarriers[] = "carriers";

const char kTagCurrentCarrierIndex[] = "currentCarrierIndex";

const char kTagShared[] = "shared";

@@ -471,16 +468,6 @@ void PopulateCellularDetails(const NetworkState* cellular,

dictionary->SetBoolean(kTagCarrierSelectFlag,

CommandLine::ForCurrentProcess()->HasSwitch(

chromeos::switches::kEnableCarrierSwitching));

- // Cellular network / connection settings.

- dictionary->SetString(kTagActivationState,

- internet_options_strings::ActivationStateString(

- cellular->activation_state()));

- dictionary->SetString(kTagRoamingState,

- internet_options_strings::RoamingStateString(

- cellular->roaming()));

- dictionary->SetString(kTagRestrictedPool,

- internet_options_strings::RestrictedStateString(

- cellular->connection_state()));

// These default to empty and are only set if device != NULL.

std::string carrier_id;