chrome/browser/ui/ash/chrome_shell_delegate_browsertest.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: chrome/browser/ui/ash/chrome_shell_delegate_browsertest.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: chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc

index 66a8927633f82b783ad22bf1bc150b5559aeb898..c03aae92e80a1d6092458bd34e627cdb638144ba 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc

+++ b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc

@@ -4,6 +4,7 @@

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

+#include "apps/native_app_window.h"

#include "apps/shell_window.h"

#include "ash/ash_switches.h"

#include "ash/shell.h"

@@ -16,7 +17,6 @@

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

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

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

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

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

#include "chrome/test/base/in_process_browser_test.h"

#include "ui/aura/client/aura_constants.h"

@@ -175,7 +175,7 @@ IN_PROC_BROWSER_TEST_F(ChromeShellDelegatePlatformAppBrowserTest,

const extensions::Extension* extension = LoadAndLaunchPlatformApp("minimal");

apps::ShellWindow* shell_window = CreateShellWindow(extension);

- NativeAppWindow* app_window = shell_window->GetBaseWindow();

+ apps::NativeAppWindow* app_window = shell_window->GetBaseWindow();

ASSERT_TRUE(shell_window->GetBaseWindow()->IsActive());

EXPECT_FALSE(app_window->IsMaximized());

EXPECT_FALSE(app_window->IsFullscreen());