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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 10268027: Revert 134740 - Root window wasn't shown in browser_test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « no previous file | chrome/browser/chrome_browser_main_extra_parts_ash.h » ('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 134755)
+++ chrome/browser/chrome_browser_main.cc (working copy)
@@ -182,6 +182,14 @@
#include "chrome/browser/chrome_browser_main_x11.h"
#endif
+#if defined(USE_AURA)
+#include "ui/aura/root_window.h"
+#endif
+
+#if defined(USE_ASH)
+#include "ash/shell.h"
+#endif
+
using content::BrowserThread;
namespace {
@@ -1889,6 +1897,7 @@
bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) {
// Set the result code set in PreMainMessageLoopRun or set above.
*result_code = result_code_;
+
if (!run_message_loop_)
return true; // Don't run the default message loop.
@@ -1896,7 +1905,11 @@
// UI thread message loop as possible to get a stable measurement
// across versions.
RecordBrowserStartupTime();
+
#if defined(USE_AURA)
+#if defined(USE_ASH)
+ ash::Shell::GetRootWindow()->ShowRootWindow();
+#endif
MessageLoopForUI::current()->Run();
#elif defined(TOOLKIT_VIEWS)
views::AcceleratorHandler accelerator_handler;
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main_extra_parts_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698