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

Unified Diff: chrome/browser/extensions/platform_app_browsertest_util.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/platform_app_browsertest_util.cc
diff --git a/chrome/browser/extensions/platform_app_browsertest_util.cc b/chrome/browser/extensions/platform_app_browsertest_util.cc
index e7151e3caaf8bd6055d3bd2feb6a3aac72346338..b8968925fd2cf0e165e90f501d0a71b9ec1a3ac1 100644
--- a/chrome/browser/extensions/platform_app_browsertest_util.cc
+++ b/chrome/browser/extensions/platform_app_browsertest_util.cc
@@ -5,6 +5,7 @@
#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"
@@ -13,7 +14,6 @@
#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 utils = extension_function_test_utils;
namespace extensions {
PlatformAppBrowserTest::PlatformAppBrowserTest() {
- chrome::ChromeShellWindowDelegate::DisableExternalOpenForTesting();
+ ChromeShellWindowDelegate::DisableExternalOpenForTesting();
}
void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) {
@@ -153,10 +153,9 @@ ShellWindow* PlatformAppBrowserTest::CreateShellWindow(
ShellWindow* PlatformAppBrowserTest::CreateShellWindowFromParams(
const Extension* extension, const ShellWindow::CreateParams& params) {
- ShellWindow* window = new ShellWindow(
- browser()->profile(),
- new chrome::ChromeShellWindowDelegate(),
- extension);
+ ShellWindow* window = new ShellWindow(browser()->profile(),
+ new ChromeShellWindowDelegate(),
+ extension);
window->Init(GURL(std::string()),
new apps::AppWindowContents(window),
params);
« no previous file with comments | « chrome/browser/extensions/platform_app_browsertest.cc ('k') | chrome/browser/extensions/shell_window_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698