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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 10273023: [Ash] Always show the root window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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.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
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 9905d8a3d85d01dc8219ab68d8d955865398b11e..49c400466d546872b02706b0a5f93628f2384df2 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -181,14 +181,6 @@
#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 {
@@ -1895,7 +1887,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
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.
@@ -1903,11 +1894,7 @@ bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) {
// 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.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698