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

Unified Diff: extensions/shell/browser/shell_desktop_controller.cc

Issue 547593002: Add ShellAppsClient, ShellAppDelegate, ShellNativeAppWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apifeatures
Patch Set: Add missing virtual Created 6 years, 3 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
Index: extensions/shell/browser/shell_desktop_controller.cc
diff --git a/extensions/shell/browser/shell_desktop_controller.cc b/extensions/shell/browser/shell_desktop_controller.cc
index 48696bddb2904a944487ee9b8f1b6d104f8edb5e..625547bd3d43bb31cda7e60efc73827f88271bdd 100644
--- a/extensions/shell/browser/shell_desktop_controller.cc
+++ b/extensions/shell/browser/shell_desktop_controller.cc
@@ -189,12 +189,17 @@ ShellAppWindow* ShellDesktopController::CreateAppWindow(
// Attach the web contents view to our window hierarchy.
aura::Window* content = app_window_->GetNativeWindow();
- root_window->AddChild(content);
+ AddAppWindow(content);
content->Show();
return app_window_.get();
}
+void ShellDesktopController::AddAppWindow(aura::Window* window) {
+ aura::Window* root_window = GetHost()->window();
+ root_window->AddChild(window);
+}
+
void ShellDesktopController::CloseAppWindows() {
app_window_.reset();
}
« no previous file with comments | « extensions/shell/browser/shell_desktop_controller.h ('k') | extensions/shell/browser/shell_native_app_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698