chrome/browser/ui/webui/options2/advanced_options_utils2_win.cc - Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst...

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/advanced_options_utils2_win.cc

Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years 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/ui/webui/options2/advanced_options_utils2_mac.mm ('k') | chrome/browser/ui/webui/options2/advanced_options_utils2_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/advanced_options_utils2_win.cc

===================================================================

--- chrome/browser/ui/webui/options2/advanced_options_utils2_win.cc (revision 116011)

+++ chrome/browser/ui/webui/options2/advanced_options_utils2_win.cc (working copy)

@@ -14,11 +14,12 @@

#include "base/path_service.h"

#include "base/threading/thread.h"

#include "chrome/browser/browser_process.h"

-#include "content/browser/tab_contents/tab_contents.h"

#include "content/browser/tab_contents/tab_contents_view.h"

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

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

using content::BrowserThread;

+using content::WebContents;

namespace options2 {

@@ -49,7 +50,7 @@

}

void AdvancedOptionsUtilities::ShowNetworkProxySettings(

- TabContents* tab_contents) {

+ WebContents* web_contents) {

DCHECK(BrowserThread::IsMessageLoopValid(BrowserThread::FILE));

BrowserThread::PostTask(BrowserThread::FILE,

FROM_HERE,

@@ -57,14 +58,14 @@

}

void AdvancedOptionsUtilities::ShowManageSSLCertificates(

- TabContents* tab_contents) {

+ WebContents* web_contents) {

CRYPTUI_CERT_MGR_STRUCT cert_mgr = { 0 };

cert_mgr.dwSize = sizeof(CRYPTUI_CERT_MGR_STRUCT);

cert_mgr.hwndParent =

#if defined(USE_AURA)

NULL;

#else

- tab_contents->GetView()->GetTopLevelNativeWindow();

+ web_contents->GetView()->GetTopLevelNativeWindow();

#endif

::CryptUIDlgCertMgr(&cert_mgr);

}