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

Unified Diff: content/shell/shell_aura.cc

Issue 11614037: Call ShowRootWindow on NativeWindow's RootWindow to display the window. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Fix mac build failure Created 7 years, 11 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 | « content/shell/shell_android.cc ('k') | content/shell/shell_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_aura.cc
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc
index 6641cda6ca94821e2aa06375bd5aa87db332d8cc..e58022873cde0858e30b5cb2d84a83dddbd8fb20 100644
--- a/content/shell/shell_aura.cc
+++ b/content/shell/shell_aura.cc
@@ -278,14 +278,12 @@ 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 +345,9 @@ void Shell::PlatformCreateWindow(int width, int height) {
#endif
window_ = window_widget_->GetNativeWindow();
+ // Call ShowRootWindow on RootWindow created by MinimalAsh without
+ // which XWindow owned by RootWindow doesn't get mapped.
+ window_->GetRootWindow()->ShowRootWindow();
window_widget_->Show();
}
« no previous file with comments | « content/shell/shell_android.cc ('k') | content/shell/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698