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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Issue 105813013: Adds views::corewm::WMState to install common state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix viewseventtestbase Created 7 years 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/ash/launcher/chrome_launcher_controller_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 0ce4edf064274bba100b949051d96c10e11b230c..78d7b55e14fcd6224b2571e313750b6494951f94 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -942,6 +942,10 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest
created_profiles_.erase(it);
}
+ virtual views::ViewsDelegate* CreateViewsDelegate() OVERRIDE {
+ return new TestViewsDelegateForAppTest;
+ }
+
private:
typedef std::map<Profile*, std::string> ProfileToNameMap;
TestingProfileManager* profile_manager() { return profile_manager_.get(); }
@@ -2356,9 +2360,6 @@ TEST_F(MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest,
TEST_F(MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest,
V2AppHandlingTwoUsers) {
InitLauncherController();
- // We need to create a dummy views delegate to be able to create a V2 app.
- scoped_ptr<TestViewsDelegateForAppTest> views_delegate(
- new TestViewsDelegateForAppTest());
// Create a profile for our second user (will be destroyed by the framework).
TestingProfile* profile2 = CreateMultiUserProfile("user2");
// Check that there is a browser and a app launcher.
@@ -2383,9 +2384,6 @@ TEST_F(MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest,
TEST_F(MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest,
V2AppHandlingTwoUsersEdgeCases) {
InitLauncherController();
- // We need to create a dummy views delegate to be able to create a V2 app.
- scoped_ptr<TestViewsDelegateForAppTest> views_delegate(
- new TestViewsDelegateForAppTest());
// Create a profile for our second user (will be destroyed by the framework).
TestingProfile* profile2 = CreateMultiUserProfile("user2");
// Check that there is a browser and a app launcher.

Powered by Google App Engine
This is Rietveld 408576698