chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h - Issue 10827283: This updates the StaticIP configuration UI to match new mocks.

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.h

Issue 10827283: This updates the StaticIP configuration UI to match new mocks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix unit test Created 8 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

« no previous file with comments | « chrome/browser/resources/options2/options_page.css ('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/internet_options_handler.h

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

index bdb058990e38eebff4393867d95c3171df65bd65..d69b1e76fae86f0302a70ec4ad5e8306ed802009 100644

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

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

@@ -126,6 +126,12 @@ class InternetOptionsHandler

// Populates the ui with the details of the given device path. This forces

// an overlay to be displayed in the UI.

void PopulateDictionaryDetails(const chromeos::Network* network);

+ // This is the second half of PopulateDictionaryDetails after the asynchronous

+ // request for Shill's service properties.

+ void PopulateDictionaryDetailsCallback(

+ const chromeos::Network* network,

+ const std::string& service_path,

+ const base::DictionaryValue* shill_properties);

void PopulateWifiDetails(const chromeos::WifiNetwork* wifi,

base::DictionaryValue* dictionary);

void PopulateWimaxDetails(const chromeos::WimaxNetwork* wimax,