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

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

Issue 22887015: Remove PerBrowser launcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nit Created 7 years, 4 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/ash/launcher/launcher_context_menu_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index dbcf723fea0d10d48cd71428f9d4b6e577d649b7..96bb85189f65d701efbe4d31dcab63e51361b4fa 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -13,21 +13,18 @@
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h"
#include "chrome/test/base/testing_profile.h"
#include "ui/aura/root_window.h"
-class TestChromeLauncherControllerPerBrowser :
- public ChromeLauncherControllerPerBrowser {
+class TestChromeLauncherController : public ChromeLauncherController {
public:
- TestChromeLauncherControllerPerBrowser(
- Profile* profile, ash::LauncherModel* model)
- : ChromeLauncherControllerPerBrowser(profile, model) {}
+ TestChromeLauncherController(Profile* profile, ash::LauncherModel* model)
+ : ChromeLauncherController(profile, model) {}
virtual bool IsLoggedInAsGuest() OVERRIDE {
return false;
}
private:
- DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherControllerPerBrowser);
+ DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherController);
};
class LauncherContextMenuTest : public ash::test::AshTestBase {
@@ -43,8 +40,7 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
virtual void SetUp() OVERRIDE {
ash::test::AshTestBase::SetUp();
controller_.reset(
- new TestChromeLauncherControllerPerBrowser(profile(),
- &launcher_model_));
+ new TestChromeLauncherController(profile(), &launcher_model_));
}
virtual void TearDown() OVERRIDE {

Powered by Google App Engine
This is Rietveld 408576698