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

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 5 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
6 6
7 #include "ash/shelf/shelf.h" 7 #include "ash/shelf/shelf.h"
8 #include "ash/shelf/shelf_item_types.h" 8 #include "ash/shelf/shelf_item_types.h"
9 #include "ash/shelf/shelf_model.h" 9 #include "ash/shelf/shelf_model.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/test/ash_test_base.h" 11 #include "ash/test/ash_test_base.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "chrome/app/chrome_command_ids.h" 13 #include "chrome/app/chrome_command_ids.h"
14 #include "chrome/browser/prefs/incognito_mode_prefs.h" 14 #include "chrome/browser/prefs/incognito_mode_prefs.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
17 #include "chrome/test/base/testing_profile.h" 17 #include "chrome/test/base/testing_profile.h"
18 #include "ui/aura/window_event_dispatcher.h" 18 #include "ui/aura/window_event_dispatcher.h"
19 19
20 class TestChromeLauncherController : public ChromeLauncherController { 20 class TestChromeLauncherController : public ChromeLauncherController {
21 public: 21 public:
22 TestChromeLauncherController(Profile* profile, ash::ShelfModel* model) 22 TestChromeLauncherController(Profile* profile, ash::ShelfModel* model)
23 : ChromeLauncherController(profile, model) {} 23 : ChromeLauncherController(profile, model) {}
24 virtual bool IsLoggedInAsGuest() OVERRIDE { 24 virtual bool IsLoggedInAsGuest() override {
25 return false; 25 return false;
26 } 26 }
27 private: 27 private:
28 DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherController); 28 DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherController);
29 }; 29 };
30 30
31 class LauncherContextMenuTest : public ash::test::AshTestBase { 31 class LauncherContextMenuTest : public ash::test::AshTestBase {
32 protected: 32 protected:
33 static bool IsItemPresentInMenu(LauncherContextMenu* menu, int command_id) { 33 static bool IsItemPresentInMenu(LauncherContextMenu* menu, int command_id) {
34 DCHECK(menu); 34 DCHECK(menu);
35 return menu->GetIndexOfCommandId(command_id) != -1; 35 return menu->GetIndexOfCommandId(command_id) != -1;
36 } 36 }
37 37
38 LauncherContextMenuTest() 38 LauncherContextMenuTest()
39 : profile_(new TestingProfile()) {} 39 : profile_(new TestingProfile()) {}
40 40
41 virtual void SetUp() OVERRIDE { 41 virtual void SetUp() override {
42 ash::test::AshTestBase::SetUp(); 42 ash::test::AshTestBase::SetUp();
43 controller_.reset( 43 controller_.reset(
44 new TestChromeLauncherController(profile(), &shelf_model_)); 44 new TestChromeLauncherController(profile(), &shelf_model_));
45 } 45 }
46 46
47 virtual void TearDown() OVERRIDE { 47 virtual void TearDown() override {
48 controller_.reset(NULL); 48 controller_.reset(NULL);
49 ash::test::AshTestBase::TearDown(); 49 ash::test::AshTestBase::TearDown();
50 } 50 }
51 51
52 LauncherContextMenu* CreateLauncherContextMenu( 52 LauncherContextMenu* CreateLauncherContextMenu(
53 ash::ShelfItemType shelf_item_type) { 53 ash::ShelfItemType shelf_item_type) {
54 ash::ShelfItem item; 54 ash::ShelfItem item;
55 item.id = 1; // dummy id 55 item.id = 1; // dummy id
56 item.type = shelf_item_type; 56 item.type = shelf_item_type;
57 return new LauncherContextMenu(controller_.get(), &item, CurrentContext()); 57 return new LauncherContextMenu(controller_.get(), &item, CurrentContext());
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW)); 102 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW));
103 103
104 // Disable Incognito mode. 104 // Disable Incognito mode.
105 IncognitoModePrefs::SetAvailability(profile()->GetPrefs(), 105 IncognitoModePrefs::SetAvailability(profile()->GetPrefs(),
106 IncognitoModePrefs::FORCED); 106 IncognitoModePrefs::FORCED);
107 menu.reset(CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT)); 107 menu.reset(CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT));
108 ASSERT_TRUE(IsItemPresentInMenu( 108 ASSERT_TRUE(IsItemPresentInMenu(
109 menu.get(), LauncherContextMenu::MENU_NEW_WINDOW)); 109 menu.get(), LauncherContextMenu::MENU_NEW_WINDOW));
110 EXPECT_FALSE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW)); 110 EXPECT_FALSE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW));
111 } 111 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_context_menu.h ('k') | chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698