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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 8174005: Get Chrome to build & link with USE_AURA on Windows again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | « build/common.gypi ('k') | chrome/browser/chrome_browser_main_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
===================================================================
--- chrome/browser/chrome_browser_main.cc (revision 104318)
+++ chrome/browser/chrome_browser_main.cc (working copy)
@@ -200,8 +200,9 @@
#endif
#if defined(USE_AURA)
-#include "chrome/browser/ui/views/aura/aura_init.h"
#include "ui/aura/desktop.h"
+#include "ui/aura_shell/shell_factory.h"
+#include "ui/aura/desktop.h"
#endif
namespace net {
@@ -1367,7 +1368,7 @@
child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
#if defined(USE_AURA)
- browser::InitAuraDesktop();
+ aura_shell::InitDesktopWindow();
#elif defined(TOOLKIT_VIEWS)
views::Widget::SetPureViews(
CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews));
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/chrome_browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698