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

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

Issue 11192007: don't init ash window unless in ash mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 7434d9c7fff09403842d49496424ac332178f970..efdb84f868e66373ce3cdca9b0bd273d803bd4f2 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -810,15 +810,17 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(Browser* browser,
}
#if defined(USE_ASH)
- // Set the browser's root window to be an active root window now so
- // that that web contents can determine correct scale factor for the
- // renderer. This is a short term fix for crbug.com/155201. Without
- // this, the renderer may use wrong scale factor first, then
- // switched to the correct scale factor, which can cause race
- // condition and lead to the results rendered at wrong scale factor.
- // Long term fix is tracked in crbug.com/15543.
- ash::Shell::GetInstance()->set_active_root_window(
- browser->window()->GetNativeWindow()->GetRootWindow());
+ if (ash::Shell::HasInstance()) {
+ // Set the browser's root window to be an active root window now so
+ // that that web contents can determine correct scale factor for the
+ // renderer. This is a short term fix for crbug.com/155201. Without
+ // this, the renderer may use wrong scale factor first, then
+ // switched to the correct scale factor, which can cause race
+ // condition and lead to the results rendered at wrong scale factor.
+ // Long term fix is tracked in crbug.com/15543.
+ ash::Shell::GetInstance()->set_active_root_window(
+ browser->window()->GetNativeWindow()->GetRootWindow());
+ }
#endif
// In kiosk mode, we want to always be fullscreen, so switch to that now.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698