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

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

Issue 21344002: Move native_app_window code to apps areas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error Created 7 years, 5 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 ad95419c138b819bfbd9e81142def11c7ba6a249..1b399db6b21db0c4eb6fa4caae8f491b93ec8b41 100644
--- a/chrome/browser/extensions/api/app_window/app_window_api.cc
+++ b/chrome/browser/extensions/api/app_window/app_window_api.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/api/app_window/app_window_api.h"
#include "apps/app_window_contents.h"
+#include "apps/native_app_window.h"
#include "apps/shell_window.h"
#include "base/command_line.h"
#include "base/time/time.h"
@@ -15,7 +16,6 @@
#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/common/extensions/api/app_window.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_types.h"
@@ -293,10 +293,9 @@ bool AppWindowCreateFunction::RunImpl() {
if (force_maximize)
create_params.state = ui::SHOW_STATE_MAXIMIZED;
- ShellWindow* shell_window = new ShellWindow(
- profile(),
- new chrome::ChromeShellWindowDelegate(),
- GetExtension());
+ ShellWindow* shell_window = new ShellWindow(profile(),
+ new ChromeShellWindowDelegate(),
+ GetExtension());
shell_window->Init(url,
new apps::AppWindowContents(shell_window),
create_params);

Powered by Google App Engine
This is Rietveld 408576698