chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc - Issue 22950007: Insufficient information on activation details should be handled correctly.

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 22950007: Insufficient information on activation details should be handled correctly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed nit, added some other changes that fell into this CL. Created 7 years, 4 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

« ash/system/chromeos/network/network_connect.cc ('K') | « ash/system/chromeos/network/network_connect.cc ('k') | chromeos/network/network_connection_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 69b0dc70562c02695b5ce251f9083c5b3da41aba..baca1b3c24c4df6f1e5b92f0418e013f34b78096 100644

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

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

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

cellular->activation_state() == flimflam::kActivationStateActivating ||

cellular->IsConnectingState());

+ // Don't show any account management related buttons if the activation

+ // state is unknown or no payment portal URL is available.

+ std::string support_url;

+ if (cellular->activation_state() == flimflam::kActivationStateUnknown ||

+ !dictionary->GetString(kTagSupportUrl, &support_url) ||

+ support_url.empty()) {

+ VLOG(2) << "No support URL is available. Don't display buttons.";

+ return;

+ }

if (cellular->activation_state() != flimflam::kActivationStateActivating &&

cellular->activation_state() != flimflam::kActivationStateActivated) {

dictionary->SetBoolean(kTagShowActivateButton, true);