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

Unified Diff: ash/shell/window_watcher_unittest.cc

Issue 277753002: Makes construction of (ash)RemoteWindowTreeHostWin explicit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 7 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 | « ash/shell/content_client/shell_browser_main_parts.cc ('k') | ash/shell_init_params.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/window_watcher_unittest.cc
diff --git a/ash/shell/window_watcher_unittest.cc b/ash/shell/window_watcher_unittest.cc
index 90ed40719834a3e470632054cfb8c87d7216b651..dd5ea40babd0e82cc10bf11193c759c8a308b85f 100644
--- a/ash/shell/window_watcher_unittest.cc
+++ b/ash/shell/window_watcher_unittest.cc
@@ -5,8 +5,9 @@
#include "ash/shell/window_watcher.h"
#include "ash/shell.h"
-#include "ash/shell_delegate.h"
#include "ash/shell/shell_delegate_impl.h"
+#include "ash/shell_delegate.h"
+#include "ash/shell_init_params.h"
#include "ash/system/user/login_status.h"
#include "ash/test/ash_test_base.h"
#include "ui/aura/window_tree_host.h"
@@ -23,7 +24,9 @@ TEST_F(WindowWatcherTest, ShellDeleteInstance) {
Shell::DeleteInstance();
shell::ShellDelegateImpl* delegate = new ash::shell::ShellDelegateImpl;
- Shell::CreateInstance(delegate);
+ ash::ShellInitParams init_params;
+ init_params.delegate = delegate;
+ Shell::CreateInstance(init_params);
Shell::GetPrimaryRootWindow()->GetHost()->Show();
Shell::GetInstance()->CreateShelf();
Shell::GetInstance()->UpdateAfterLoginStatusChange(
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.cc ('k') | ash/shell_init_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698