Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5104)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/views/task_manager_view.cc ('K') | « chrome/browser/ui/views/task_manager_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | chrome/chrome_browser.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/advanced_options_utils_win.cc
===================================================================
--- chrome/browser/ui/webui/options/advanced_options_utils_win.cc (revision 99456)
+++ chrome/browser/ui/webui/options/advanced_options_utils_win.cc (working copy)
@@ -62,6 +62,10 @@
CRYPTUI_CERT_MGR_STRUCT cert_mgr = { 0 };
cert_mgr.dwSize = sizeof(CRYPTUI_CERT_MGR_STRUCT);
cert_mgr.hwndParent =
- tab_contents->view()->GetTopLevelNativeWindow();
+#if defined(USE_AURA)
+ NULL;
+#else
+ tab_contents->view()->GetTopLevelNativeWindow();
+#endif
::CryptUIDlgCertMgr(&cert_mgr);
}
« chrome/browser/ui/views/task_manager_view.cc ('K') | « chrome/browser/ui/views/task_manager_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | chrome/chrome_browser.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698