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

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

Issue 2684723003: Remove LauncherItemController::Launch, cleanup. (Closed)
Patch Set: Cleanup Created 3 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/chrome_launcher_controller_impl.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 // Test implementation of a V2 app launcher item controller. 253 // Test implementation of a V2 app launcher item controller.
254 class TestV2AppLauncherItemController : public LauncherItemController { 254 class TestV2AppLauncherItemController : public LauncherItemController {
255 public: 255 public:
256 TestV2AppLauncherItemController(const std::string& app_id, 256 TestV2AppLauncherItemController(const std::string& app_id,
257 ChromeLauncherController* controller) 257 ChromeLauncherController* controller)
258 : LauncherItemController(app_id, std::string(), controller) {} 258 : LauncherItemController(app_id, std::string(), controller) {}
259 259
260 ~TestV2AppLauncherItemController() override {} 260 ~TestV2AppLauncherItemController() override {}
261 261
262 // Override for LauncherItemController: 262 // Override for LauncherItemController:
263 void Launch(ash::LaunchSource source, int event_flags) override {}
264 ash::ShelfItemDelegate::PerformedAction Activate( 263 ash::ShelfItemDelegate::PerformedAction Activate(
265 ash::LaunchSource source) override { 264 ash::LaunchSource source) override {
266 return kExistingWindowActivated; 265 return kExistingWindowActivated;
267 } 266 }
268 ash::ShelfItemDelegate::PerformedAction ItemSelected( 267 ash::ShelfItemDelegate::PerformedAction ItemSelected(
269 const ui::Event& event) override { 268 const ui::Event& event) override {
270 return kExistingWindowActivated; 269 return kExistingWindowActivated;
271 } 270 }
272 ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override { 271 ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override {
273 ash::ShelfAppMenuItemList items; 272 ash::ShelfAppMenuItemList items;
(...skipping 3940 matching lines...) Expand 10 before | Expand all | Expand 10 after
4214 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, 4213 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
4215 shelf_controller->auto_hide()); 4214 shelf_controller->auto_hide());
4216 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count()); 4215 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count());
4217 4216
4218 PrefService* prefs = profile()->GetTestingPrefService(); 4217 PrefService* prefs = profile()->GetTestingPrefService();
4219 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal)); 4218 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal));
4220 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment)); 4219 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment));
4221 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal)); 4220 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal));
4222 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior)); 4221 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior));
4223 } 4222 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698