| OLD | NEW |
| 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 // Test implementation of a V2 app launcher item controller. | 249 // Test implementation of a V2 app launcher item controller. |
| 250 class TestV2AppLauncherItemController : public LauncherItemController { | 250 class TestV2AppLauncherItemController : public LauncherItemController { |
| 251 public: | 251 public: |
| 252 TestV2AppLauncherItemController(const std::string& app_id, | 252 TestV2AppLauncherItemController(const std::string& app_id, |
| 253 ChromeLauncherController* controller) | 253 ChromeLauncherController* controller) |
| 254 : LauncherItemController(app_id, "", controller) {} | 254 : LauncherItemController(app_id, "", controller) {} |
| 255 | 255 |
| 256 ~TestV2AppLauncherItemController() override {} | 256 ~TestV2AppLauncherItemController() override {} |
| 257 | 257 |
| 258 // Override for LauncherItemController: | 258 // Override for LauncherItemController: |
| 259 bool IsVisible() const override { return true; } | |
| 260 void Launch(ash::LaunchSource source, int event_flags) override {} | 259 void Launch(ash::LaunchSource source, int event_flags) override {} |
| 261 ash::ShelfItemDelegate::PerformedAction Activate( | 260 ash::ShelfItemDelegate::PerformedAction Activate( |
| 262 ash::LaunchSource source) override { | 261 ash::LaunchSource source) override { |
| 263 return kExistingWindowActivated; | 262 return kExistingWindowActivated; |
| 264 } | 263 } |
| 265 void Close() override {} | 264 void Close() override {} |
| 266 ash::ShelfItemDelegate::PerformedAction ItemSelected( | 265 ash::ShelfItemDelegate::PerformedAction ItemSelected( |
| 267 const ui::Event& event) override { | 266 const ui::Event& event) override { |
| 268 return kExistingWindowActivated; | 267 return kExistingWindowActivated; |
| 269 } | 268 } |
| (...skipping 3794 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4064 | 4063 |
| 4065 // Pinned state should not change. | 4064 // Pinned state should not change. |
| 4066 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); | 4065 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); |
| 4067 launcher_controller_->UnpinAppWithID(extension2_->id()); | 4066 launcher_controller_->UnpinAppWithID(extension2_->id()); |
| 4068 EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus()); | 4067 EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus()); |
| 4069 | 4068 |
| 4070 // Resume syncing and sync information overrides local copy. | 4069 // Resume syncing and sync information overrides local copy. |
| 4071 StartAppSyncService(copy_sync_list); | 4070 StartAppSyncService(copy_sync_list); |
| 4072 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); | 4071 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); |
| 4073 } | 4072 } |
| OLD | NEW |