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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/startup/startup_browser_creator.cc

Issue 12220101: Minimal Chrome Frame with Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync to r184453 Created 7 years, 10 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/external_tab/external_tab_container.h ('k') | chrome/browser/ui/views/external_tab_container_win.h » ('j') | chrome/browser/ui/views/external_tab_container_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/startup/startup_browser_creator.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index ff86e6fc305c1b7099a966bbabd87eab2a7753be..84d28aeb4db8e1ed6a1bad2082e7fc10564bb66d 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -27,7 +27,6 @@
#include "chrome/browser/auto_launch_trial.h"
#include "chrome/browser/automation/automation_provider.h"
#include "chrome/browser/automation/automation_provider_list.h"
-#include "chrome/browser/automation/chrome_frame_automation_provider.h"
#include "chrome/browser/automation/testing_automation_provider.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
@@ -78,6 +77,7 @@
#endif
#if defined(OS_WIN)
+#include "chrome/browser/automation/chrome_frame_automation_provider_win.h"
#include "chrome/browser/ui/startup/startup_browser_creator_win.h"
#endif
@@ -497,7 +497,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
if (command_line.HasSwitch(switches::kChromeFrame)) {
-#if !defined(USE_AURA)
+#if defined(OS_WIN)
if (!CreateAutomationProvider<ChromeFrameAutomationProvider>(
automation_channel_id, last_used_profile, expected_tabs))
return false;
« no previous file with comments | « chrome/browser/external_tab/external_tab_container.h ('k') | chrome/browser/ui/views/external_tab_container_win.h » ('j') | chrome/browser/ui/views/external_tab_container_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698