trunk/src/chrome/browser/extensions/api/app_window/app_window_api.cc - Issue 22355002: Revert 215753 "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: trunk/src/chrome/browser/extensions/api/app_window/app_window_api.cc

Issue 22355002: Revert 215753 "Move native_app_window code to apps areas" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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: trunk/src/chrome/browser/extensions/api/app_window/app_window_api.cc

===================================================================

--- trunk/src/chrome/browser/extensions/api/app_window/app_window_api.cc (revision 215780)

+++ trunk/src/chrome/browser/extensions/api/app_window/app_window_api.cc (working copy)

@@ -5,7 +5,6 @@

#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"

@@ -16,6 +15,7 @@

#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 "chrome/common/extensions/features/feature.h"

#include "content/public/browser/notification_registrar.h"

@@ -294,9 +294,10 @@

if (force_maximize)

create_params.state = ui::SHOW_STATE_MAXIMIZED;

- ShellWindow* shell_window = new ShellWindow(profile(),

- new ChromeShellWindowDelegate(),

- GetExtension());

+ ShellWindow* shell_window = new ShellWindow(

+ profile(),

+ new chrome::ChromeShellWindowDelegate(),

+ GetExtension());

shell_window->Init(url,

new apps::AppWindowContents(shell_window),

create_params);