trunk/src/chrome/browser/extensions/platform_app_browsertest_util.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/platform_app_browsertest_util.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « trunk/src/chrome/browser/extensions/platform_app_browsertest.cc ('k') | trunk/src/chrome/browser/extensions/shell_window_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/extensions/platform_app_browsertest_util.cc

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

--- trunk/src/chrome/browser/extensions/platform_app_browsertest_util.cc (revision 215780)

+++ trunk/src/chrome/browser/extensions/platform_app_browsertest_util.cc (working copy)

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

#include "chrome/browser/extensions/platform_app_browsertest_util.h"

#include "apps/app_window_contents.h"

-#include "apps/native_app_window.h"

#include "base/command_line.h"

#include "base/strings/stringprintf.h"

#include "chrome/browser/extensions/api/tabs/tabs_api.h"

@@ -14,6 +13,7 @@

#include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/extensions/application_launch.h"

+#include "chrome/browser/ui/extensions/native_app_window.h"

#include "chrome/common/chrome_switches.h"

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

#include "content/public/test/test_utils.h"

@@ -27,7 +27,7 @@

namespace extensions {

PlatformAppBrowserTest::PlatformAppBrowserTest() {

- ChromeShellWindowDelegate::DisableExternalOpenForTesting();

+ chrome::ChromeShellWindowDelegate::DisableExternalOpenForTesting();

}

void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) {

@@ -153,9 +153,10 @@

ShellWindow* PlatformAppBrowserTest::CreateShellWindowFromParams(

const Extension* extension, const ShellWindow::CreateParams& params) {

- ShellWindow* window = new ShellWindow(browser()->profile(),

- new ChromeShellWindowDelegate(),

- extension);

+ ShellWindow* window = new ShellWindow(

+ browser()->profile(),

+ new chrome::ChromeShellWindowDelegate(),

+ extension);

window->Init(GURL(std::string()),

new apps::AppWindowContents(window),

params);