extensions/shell/test/shell_test.cc - Issue 696063008: Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations.

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: extensions/shell/test/shell_test.cc

Issue 696063008: Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: rebase Created 6 years, 1 month 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

« extensions/shell/browser/shell_native_app_window_aura_unittest.cc ('K') | « extensions/shell/browser/shell_native_app_window_aura_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/shell/test/shell_test.cc

diff --git a/extensions/shell/test/shell_test.cc b/extensions/shell/test/shell_test.cc

index 87e543040a697f201caf13ea8703bbc1b71c0d07..37147766adc55352b795660bd451ac84ebb11249 100644

--- a/extensions/shell/test/shell_test.cc

+++ b/extensions/shell/test/shell_test.cc

@@ -8,8 +8,8 @@

#include "base/logging.h"

#include "content/public/common/content_switches.h"

#include "extensions/browser/extension_system.h"

+#include "extensions/shell/browser/desktop_controller.h"

#include "extensions/shell/browser/shell_content_browser_client.h"

-#include "extensions/shell/browser/shell_desktop_controller.h"

#include "extensions/shell/browser/shell_extension_system.h"

namespace extensions {

@@ -44,7 +44,7 @@ void AppShellTest::RunTestOnMainThreadLoop() {

TearDownOnMainThread();

// Clean up the app window.

- ShellDesktopController::instance()->CloseAppWindows();

+ DesktopController::instance()->CloseAppWindows();

}

} // namespace extensions