apps/shell_window.cc - Issue 21344002: Move native_app_window code to apps areas

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Rebase to after mac app shim fix Created 7 years, 4 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:

Index: apps/shell_window.cc

diff --git a/apps/shell_window.cc b/apps/shell_window.cc

index d0dd9cc0c05de467155ba9aea376cfc8b0b678a1..12585aad5d534ce346ed3e1f82b9dd5545878899 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"

@@ -15,7 +16,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"

@@ -156,7 +156,7 @@ void ShellWindow::Init(const GURL& url,

new_params.bounds = bounds;

- 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())

« no previous file with comments | « apps/shell_window.h ('k') | chrome/browser/extensions/DEPS » ('j') | no next file with comments »