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

Unified Diff: ash/launcher/launcher_view_unittest.cc

Issue 23449033: [ash] Remove Launcher::GetLauncherViewForTest() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing class keyword Created 7 years, 3 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/launcher/launcher_unittest.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_view_unittest.cc
diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc
index a92f969c10d227fcaa2bf1650a3adc6dd60a50d4..2e51597737d88423b66ec2e00c33a90f06cf66c5 100644
--- a/ash/launcher/launcher_view_unittest.cc
+++ b/ash/launcher/launcher_view_unittest.cc
@@ -20,6 +20,7 @@
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
+#include "ash/test/launcher_test_api.h"
#include "ash/test/launcher_view_test_api.h"
#include "ash/test/shell_test_api.h"
#include "ash/test/test_launcher_delegate.h"
@@ -86,7 +87,7 @@ class LauncherViewIconObserverTest : public ash::test::AshTestBase {
observer_.reset(new TestLauncherIconObserver(launcher));
launcher_view_test_.reset(new LauncherViewTestAPI(
- launcher->GetLauncherViewForTest()));
+ LauncherTestAPI(launcher).launcher_view()));
launcher_view_test_->SetAnimationDuration(1);
}
@@ -203,7 +204,7 @@ class LauncherViewTest : public AshTestBase {
test::ShellTestApi test_api(Shell::GetInstance());
model_ = test_api.launcher_model();
Launcher* launcher = Launcher::ForPrimaryDisplay();
- launcher_view_ = launcher->GetLauncherViewForTest();
+ launcher_view_ = test::LauncherTestAPI(launcher).launcher_view();
// The bounds should be big enough for 4 buttons + overflow chevron.
launcher_view_->SetBounds(0, 0, 500, 50);
« no previous file with comments | « ash/launcher/launcher_unittest.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698