Chromium Code Reviews| 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..ebe299713fc23d68c72d7ee2255a7a9c81dd4017 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,21 @@ |
| #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/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h" |
| #include "chrome/test/base/testing_profile.h" |
| #include "ui/aura/root_window.h" |
| -class TestChromeLauncherControllerPerBrowser : |
| - public ChromeLauncherControllerPerBrowser { |
| +class TestChromeLauncherControllerPerApp : |
|
Mr4D (OOO till 08-26)
2013/08/16 22:43:22
Remove the "PerApp" here.
simonhong_
2013/08/19 05:26:11
Done.
|
| + public ChromeLauncherControllerPerApp { |
| public: |
| - TestChromeLauncherControllerPerBrowser( |
| + TestChromeLauncherControllerPerApp( |
| Profile* profile, ash::LauncherModel* model) |
| - : ChromeLauncherControllerPerBrowser(profile, model) {} |
| + : ChromeLauncherControllerPerApp(profile, model) {} |
| virtual bool IsLoggedInAsGuest() OVERRIDE { |
| return false; |
| } |
| private: |
| - DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherControllerPerBrowser); |
| + DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherControllerPerApp); |
|
Mr4D (OOO till 08-26)
2013/08/16 22:43:22
Remove PerApp.
simonhong_
2013/08/19 05:26:11
Done.
|
| }; |
| class LauncherContextMenuTest : public ash::test::AshTestBase { |
| @@ -43,7 +43,7 @@ class LauncherContextMenuTest : public ash::test::AshTestBase { |
| virtual void SetUp() OVERRIDE { |
| ash::test::AshTestBase::SetUp(); |
| controller_.reset( |
| - new TestChromeLauncherControllerPerBrowser(profile(), |
| + new TestChromeLauncherControllerPerApp(profile(), |
|
Mr4D (OOO till 08-26)
2013/08/16 22:43:22
Remove PerApp & indenting.
simonhong_
2013/08/19 05:26:11
Done.
|
| &launcher_model_)); |
| } |