chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc - Issue 292663018: [cros login] Cleanup: replace some of Profile usages with BrowserContext.

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/chromeos/login/ui/proxy_settings_dialog.cc

Issue 292663018: [cros login] Cleanup: replace some of Profile usages with BrowserContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add missing include, fix ProxySettingsDialog ctor Created 6 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/chromeos/login/ui/proxy_settings_dialog.h ('k') | chrome/browser/chromeos/login/ui/simple_web_view_dialog_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc

diff --git a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc

index 14da882cd8235aeb51b75086573600c8419002bd..ae2004a57b8f8f82f8ec49e0c024dbae11274f3f 100644

--- a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc

+++ b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc

@@ -11,6 +11,7 @@

#include "chrome/common/url_constants.h"

#include "chromeos/network/network_state.h"

#include "chromeos/network/shill_property_util.h"

+#include "content/public/browser/browser_context.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

#include "grit/generated_resources.h"

@@ -51,11 +52,12 @@ namespace chromeos {

// static

int ProxySettingsDialog::instance_count_ = 0;

-ProxySettingsDialog::ProxySettingsDialog(Profile* profile,

- const NetworkState& network,

- LoginWebDialog::Delegate* delegate,

- gfx::NativeWindow window)

- : LoginWebDialog(profile,

+ProxySettingsDialog::ProxySettingsDialog(

+ content::BrowserContext* browser_context,

+ const NetworkState& network,

+ LoginWebDialog::Delegate* delegate,

+ gfx::NativeWindow window)

+ : LoginWebDialog(browser_context,

delegate,

window,

base::string16(),