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

Unified Diff: apps/shell_window.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: apps/shell_window.cc
diff --git a/apps/shell_window.cc b/apps/shell_window.cc
index 3fd2314f28fa1dc7f1889c1157c0e265b1d0d456..94784a69f145d8c09939e06c6c31c7a780dc405a 100644
--- a/apps/shell_window.cc
+++ b/apps/shell_window.cc
@@ -4,6 +4,7 @@
#include "apps/shell_window.h"
+#include "apps/native_app_window.h"
#include "apps/shell_window_geometry_cache.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -16,7 +17,6 @@
#include "chrome/browser/extensions/suggest_permission_util.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/extensions/native_app_window.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_messages.h"
@@ -161,7 +161,7 @@ void ShellWindow::Init(const GURL& url,
if (cached_state != ui::SHOW_STATE_DEFAULT)
new_params.state = cached_state;
- native_app_window_.reset(NativeAppWindow::Create(this, new_params));
+ native_app_window_.reset(delegate_->CreateNativeAppWindow(this, new_params));
if (!new_params.hidden) {
if (window_type_is_panel())

Powered by Google App Engine
This is Rietveld 408576698