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

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

Issue 2627533002: Replace ShelfItemDelegate::GetTitle() with ShelfItem::title. (Closed)
Patch Set: Address comments. Created 3 years, 11 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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 void Launch(ash::LaunchSource source, int event_flags) override {} 260 void Launch(ash::LaunchSource source, int event_flags) override {}
261 ash::ShelfItemDelegate::PerformedAction Activate( 261 ash::ShelfItemDelegate::PerformedAction Activate(
262 ash::LaunchSource source) override { 262 ash::LaunchSource source) override {
263 return kExistingWindowActivated; 263 return kExistingWindowActivated;
264 } 264 }
265 void Close() override {} 265 void Close() override {}
266 ash::ShelfItemDelegate::PerformedAction ItemSelected( 266 ash::ShelfItemDelegate::PerformedAction ItemSelected(
267 const ui::Event& event) override { 267 const ui::Event& event) override {
268 return kExistingWindowActivated; 268 return kExistingWindowActivated;
269 } 269 }
270 base::string16 GetTitle() override { return base::string16(); }
271 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override { 270 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override {
272 ChromeLauncherAppMenuItems items; 271 ChromeLauncherAppMenuItems items;
273 items.push_back(base::MakeUnique<ChromeLauncherAppMenuItem>( 272 items.push_back(base::MakeUnique<ChromeLauncherAppMenuItem>(
274 base::string16(), nullptr, false)); 273 base::string16(), nullptr, false));
275 items.push_back(base::MakeUnique<ChromeLauncherAppMenuItem>( 274 items.push_back(base::MakeUnique<ChromeLauncherAppMenuItem>(
276 base::string16(), nullptr, false)); 275 base::string16(), nullptr, false));
277 return items; 276 return items;
278 } 277 }
279 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override { 278 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override {
280 return NULL; 279 return NULL;
(...skipping 3784 matching lines...) Expand 10 before | Expand all | Expand 10 after
4065 4064
4066 // Pinned state should not change. 4065 // Pinned state should not change.
4067 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); 4066 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus());
4068 launcher_controller_->UnpinAppWithID(extension2_->id()); 4067 launcher_controller_->UnpinAppWithID(extension2_->id());
4069 EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus()); 4068 EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus());
4070 4069
4071 // Resume syncing and sync information overrides local copy. 4070 // Resume syncing and sync information overrides local copy.
4072 StartAppSyncService(copy_sync_list); 4071 StartAppSyncService(copy_sync_list);
4073 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); 4072 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus());
4074 } 4073 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698