chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm - Issue 166573005: Rename apps::ShellWindow to apps::AppWindow

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/cocoa/apps/native_app_window_cocoa_browsertest.mm

Issue 166573005: Rename apps::ShellWindow to apps::AppWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, nits (rename) Created 6 years, 10 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 | « chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm ('k') | chrome/browser/ui/gtk/apps/chrome_shell_window_delegate_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

index 35bbfada62a287f9c599ce828f1b1827e9279435..197680667bdea8348b77082c9b71668968a77908 100644

--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

@@ -6,10 +6,10 @@

#import <Cocoa/Cocoa.h>

-#include "apps/shell_window_registry.h"

+#include "apps/app_window_registry.h"

#include "chrome/browser/apps/app_browsertest_util.h"

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

#include "chrome/browser/profiles/profile.h"

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

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

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

@@ -50,8 +50,8 @@ class NativeAppWindowCocoaBrowserTest : public PlatformAppBrowserTest {

// Test interaction of Hide/Show() with Hide/ShowWithApp().

IN_PROC_BROWSER_TEST_F(NativeAppWindowCocoaBrowserTest, HideShowWithApp) {

SetUpAppWithWindows(2);

- apps::ShellWindowRegistry::ShellWindowList windows =

- apps::ShellWindowRegistry::Get(profile())->shell_windows();

+ apps::AppWindowRegistry::AppWindowList windows =

+ apps::AppWindowRegistry::Get(profile())->app_windows();

apps::NativeAppWindow* window = windows.front()->GetBaseWindow();

NSWindow* ns_window = window->GetNativeWindow();

apps::NativeAppWindow* other_window = windows.back()->GetBaseWindow();