Chromium Code Reviews| 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); |