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

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

Issue 11066130: Fix for out-of-sync scale factor issue (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 | « ash/display/multi_display_manager.cc ('k') | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | 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 451b0e5c5b8b01fc7719ceb7a846a9a56cd9f499..d9413dce7c7e8a20521d1c0cee59a1ce10b06168 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -95,6 +95,8 @@
#if defined(USE_ASH)
#include "ash/launcher/launcher_types.h"
+#include "ash/shell.h"
+#include "ui/aura/window.h"
#endif
#if defined(OS_MACOSX)
@@ -806,6 +808,14 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(Browser* browser,
#endif
}
+#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. crbug.com/155201.
+ ash::Shell::GetInstance()->set_active_root_window(
sky 2012/10/12 14:31:40 I don't understand why this is necessary. Why is t
oshima 2012/10/12 16:04:46 We're not passing enough information for WebConten
+ browser->window()->GetNativeWindow()->GetRootWindow());
+#endif
+
// In kiosk mode, we want to always be fullscreen, so switch to that now.
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
chrome::ToggleFullscreenMode(browser);
« no previous file with comments | « ash/display/multi_display_manager.cc ('k') | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698