| 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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 256   TestV2AppLauncherItemController(const std::string& app_id, | 256   TestV2AppLauncherItemController(const std::string& app_id, | 
| 257                                   ChromeLauncherController* controller) | 257                                   ChromeLauncherController* controller) | 
| 258       : LauncherItemController(LauncherItemController::TYPE_APP, | 258       : LauncherItemController(LauncherItemController::TYPE_APP, | 
| 259                                app_id, | 259                                app_id, | 
| 260                                "", | 260                                "", | 
| 261                                controller) {} | 261                                controller) {} | 
| 262 | 262 | 
| 263   ~TestV2AppLauncherItemController() override {} | 263   ~TestV2AppLauncherItemController() override {} | 
| 264 | 264 | 
| 265   // Override for LauncherItemController: | 265   // Override for LauncherItemController: | 
| 266   bool IsOpen() const override { return true; } |  | 
| 267   bool IsVisible() const override { return true; } | 266   bool IsVisible() const override { return true; } | 
| 268   void Launch(ash::LaunchSource source, int event_flags) override {} | 267   void Launch(ash::LaunchSource source, int event_flags) override {} | 
| 269   ash::ShelfItemDelegate::PerformedAction Activate( | 268   ash::ShelfItemDelegate::PerformedAction Activate( | 
| 270       ash::LaunchSource source) override { | 269       ash::LaunchSource source) override { | 
| 271     return kExistingWindowActivated; | 270     return kExistingWindowActivated; | 
| 272   } | 271   } | 
| 273   void Close() override {} | 272   void Close() override {} | 
| 274   ash::ShelfItemDelegate::PerformedAction ItemSelected( | 273   ash::ShelfItemDelegate::PerformedAction ItemSelected( | 
| 275       const ui::Event& event) override { | 274       const ui::Event& event) override { | 
| 276     return kExistingWindowActivated; | 275     return kExistingWindowActivated; | 
| (...skipping 3767 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4044 | 4043 | 
| 4045   // Pinned state should not change. | 4044   // Pinned state should not change. | 
| 4046   EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); | 4045   EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); | 
| 4047   launcher_controller_->UnpinAppWithID(extension2_->id()); | 4046   launcher_controller_->UnpinAppWithID(extension2_->id()); | 
| 4048   EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus()); | 4047   EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus()); | 
| 4049 | 4048 | 
| 4050   // Resume syncing and sync information overrides local copy. | 4049   // Resume syncing and sync information overrides local copy. | 
| 4051   StartAppSyncService(copy_sync_list); | 4050   StartAppSyncService(copy_sync_list); | 
| 4052   EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); | 4051   EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); | 
| 4053 } | 4052 } | 
| OLD | NEW | 
|---|