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

Unified Diff: chrome/browser/extensions/api/app_window/app_window_api.cc

Issue 16702003: Move ShellWindow into apps component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yar Created 7 years, 6 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: chrome/browser/extensions/api/app_window/app_window_api.cc
diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc
index a194acc44a2e839f217c8ecdd7a759f686472358..1c0a0e576f6f04056aaca6afebbfafc874700ad4 100644
--- a/chrome/browser/extensions/api/app_window/app_window_api.cc
+++ b/chrome/browser/extensions/api/app_window/app_window_api.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/api/app_window/app_window_api.h"
+#include "apps/shell_window.h"
#include "base/command_line.h"
#include "base/time/time.h"
#include "base/values.h"
@@ -12,8 +13,8 @@
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/extensions/shell_window_registry.h"
#include "chrome/browser/extensions/window_controller.h"
+#include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
#include "chrome/browser/ui/extensions/native_app_window.h"
-#include "chrome/browser/ui/extensions/shell_window.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/api/app_window.h"
#include "content/public/browser/notification_registrar.h"
@@ -33,6 +34,8 @@
#include "ui/aura/window.h"
#endif
+using apps::ShellWindow;
+
namespace app_window = extensions::api::app_window;
namespace Create = app_window::Create;
@@ -289,8 +292,12 @@ bool AppWindowCreateFunction::RunImpl() {
if (force_maximize)
create_params.state = ui::SHOW_STATE_MAXIMIZED;
- ShellWindow* shell_window =
- ShellWindow::Create(profile(), GetExtension(), url, create_params);
+ ShellWindow* shell_window = ShellWindow::Create(
+ profile(),
+ new chrome::ChromeShellWindowDelegate(),
+ GetExtension(),
+ url,
+ create_params);
if (chrome::ShouldForceFullscreenApp())
shell_window->Fullscreen();

Powered by Google App Engine
This is Rietveld 408576698