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

Unified Diff: chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

Issue 157813007: Remove Profile dependency from apps::ShellWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moar. 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
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 13afc2e92732db2bbaa39219325b907abc86fc20..db6db0e7cfeda5a09fc7692ceb895848cce40e54 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
@@ -30,8 +30,11 @@ class NativeAppWindowCocoaBrowserTest : public PlatformAppBrowserTest {
content::WindowedNotificationObserver app_loaded_observer(
content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
content::NotificationService::AllSources());
- OpenApplication(AppLaunchParams(
- profile(), app_, extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW));
+ OpenApplication(
+ AppLaunchParams(Profile::FromBrowserContext(browser_context()),
+ app_,
+ extensions::LAUNCH_CONTAINER_NONE,
+ NEW_WINDOW));
app_loaded_observer.Wait();
}
}
@@ -48,7 +51,7 @@ class NativeAppWindowCocoaBrowserTest : public PlatformAppBrowserTest {
IN_PROC_BROWSER_TEST_F(NativeAppWindowCocoaBrowserTest, HideShowWithApp) {
SetUpAppWithWindows(2);
apps::ShellWindowRegistry::ShellWindowList windows =
- apps::ShellWindowRegistry::Get(profile())->shell_windows();
+ apps::ShellWindowRegistry::Get(browser_context())->shell_windows();
apps::NativeAppWindow* window = windows.front()->GetBaseWindow();
NSWindow* ns_window = window->GetNativeWindow();
apps::NativeAppWindow* other_window = windows.back()->GetBaseWindow();

Powered by Google App Engine
This is Rietveld 408576698