Chromium Code Reviews| Index: content/shell/shell_aura.cc |
| diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc |
| index 6641cda6ca94821e2aa06375bd5aa87db332d8cc..fdfceef7ad0d270ed8f6f8573bd46ab043160fb1 100644 |
| --- a/content/shell/shell_aura.cc |
| +++ b/content/shell/shell_aura.cc |
| @@ -278,14 +278,14 @@ MinimalAsh* Shell::minimal_ash_ = NULL; |
| views::ViewsDelegate* Shell::views_delegate_ = NULL; |
| // static |
| -void Shell::PlatformInitialize() { |
| +void Shell::PlatformInitialize(const gfx::Size& default_window_size) { |
| #if defined(OS_CHROMEOS) |
| chromeos::DBusThreadManager::Initialize(); |
| #endif |
| #if defined(OS_CHROMEOS) |
| gfx::Screen::SetScreenInstance( |
| gfx::SCREEN_TYPE_NATIVE, new aura::TestScreen); |
| - minimal_ash_ = new content::MinimalAsh(); |
| + minimal_ash_ = new content::MinimalAsh(default_window_size); |
| #else |
| gfx::Screen::SetScreenInstance( |
| gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen()); |
| @@ -347,6 +347,11 @@ void Shell::PlatformCreateWindow(int width, int height) { |
| #endif |
| window_ = window_widget_->GetNativeWindow(); |
| +#if defined(OS_CHROMEOS) |
|
sky
2013/01/24 18:39:06
Why is this chromeos specific? Don't we need the s
Nayan
2013/01/24 18:49:12
I am not sure whether this issue is seen in window
|
| + // Call ShowRootWindow on RootWindow created by MinimalAsh without |
| + // which XWindow owned by RootWindow doesn't get mapped. |
| + window_->GetRootWindow()->ShowRootWindow(); |
| +#endif |
| window_widget_->Show(); |
| } |