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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/browser_init.cc

Issue 7841012: Get chrome to link 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
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views_win.cc ('k') | chrome/browser/ui/panels/auto_hiding_desktop_bar_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_init.cc
===================================================================
--- chrome/browser/ui/browser_init.cc (revision 99983)
+++ chrome/browser/ui/browser_init.cc (working copy)
@@ -1419,9 +1419,11 @@
silent_launch = true;
if (command_line.HasSwitch(switches::kChromeFrame)) {
+#if !defined(USE_AURA)
if (!CreateAutomationProvider<ChromeFrameAutomationProvider>(
automation_channel_id, profile, expected_tabs))
return false;
+#endif
} else {
if (!CreateAutomationProvider<AutomationProvider>(
automation_channel_id, profile, expected_tabs))
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views_win.cc ('k') | chrome/browser/ui/panels/auto_hiding_desktop_bar_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698