chrome/browser/ui/webui/options/chromeos/internet_options_handler.h - Issue 11367048: This is the first pass at making GetIPConfigs asynchronous.

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

Issue 11367048: This is the first pass at making GetIPConfigs asynchronous. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 1 month 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

« chrome/browser/chromeos/cros/network_library.cc ('K') | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8d3b0e633a8b324c8bf39bd704523f3409d305bc..0d10d3517c41ebe292fe1a979a3e4cdcfa4a2722 100644

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

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

@@ -9,6 +9,7 @@

#include "base/compiler_specific.h"

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

+#include "chrome/browser/chromeos/cros/network_ip_config.h"

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

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

#include "chrome/browser/ui/webui/options/options_ui.h"

@@ -128,7 +129,12 @@ class InternetOptionsHandler

void PopulateDictionaryDetailsCallback(

const chromeos::Network* network,

const std::string& service_path,

- const base::DictionaryValue* shill_properties);

+ scoped_ptr<base::DictionaryValue> shill_properties);

+ void PopulateIPConfigsCallback(

+ const chromeos::Network* network,

+ scoped_ptr<base::DictionaryValue> shill_properties,

+ const chromeos::NetworkIPConfigVector& ipconfigs,

+ const std::string& hardware_address);

void PopulateWifiDetails(const chromeos::WifiNetwork* wifi,

base::DictionaryValue* dictionary);

void PopulateWimaxDetails(const chromeos::WimaxNetwork* wimax,