chrome/browser/ui/webui/options/advanced_options_utils_win.cc - Issue 7834048: Preliminary work to allow Chrome to build with USE_AURA

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/webui/options/advanced_options_utils_win.cc

Issue 7834048: Preliminary work to allow Chrome to build with USE_AURA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"	5 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"

6	6

7 #include <windows.h>	7 #include <windows.h>

8 #include <cryptuiapi.h>	8 #include <cryptuiapi.h>

9 #pragma comment(lib, "cryptui.lib")	9 #pragma comment(lib, "cryptui.lib")

10 #include <shellapi.h>	10 #include <shellapi.h>

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 base::Thread* thread = g_browser_process->file_thread();	55 base::Thread* thread = g_browser_process->file_thread();

56 DCHECK(thread);	56 DCHECK(thread);

57 thread->message_loop()->PostTask(FROM_HERE, new OpenConnectionDialogTask);	57 thread->message_loop()->PostTask(FROM_HERE, new OpenConnectionDialogTask);

58 }	58 }

59	59

60 void AdvancedOptionsUtilities::ShowManageSSLCertificates(	60 void AdvancedOptionsUtilities::ShowManageSSLCertificates(

61 TabContents* tab_contents) {	61 TabContents* tab_contents) {

62 CRYPTUI_CERT_MGR_STRUCT cert_mgr = { 0 };	62 CRYPTUI_CERT_MGR_STRUCT cert_mgr = { 0 };

63 cert_mgr.dwSize = sizeof(CRYPTUI_CERT_MGR_STRUCT);	63 cert_mgr.dwSize = sizeof(CRYPTUI_CERT_MGR_STRUCT);

64 cert_mgr.hwndParent =	64 cert_mgr.hwndParent =

65 tab_contents->view()->GetTopLevelNativeWindow();	65 #if defined(USE_AURA)

	66 NULL;

	67 #else

	68 tab_contents->view()->GetTopLevelNativeWindow();

	69 #endif

66 ::CryptUIDlgCertMgr(&cert_mgr);	70 ::CryptUIDlgCertMgr(&cert_mgr);

67 }	71 }

OLD	NEW

« no previous file with comments | « chrome/browser/ui/views/task_manager_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »