| 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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 ChromeLauncherAppMenuItems items; | 272 ChromeLauncherAppMenuItems items; |
| 273 items.push_back( | 273 items.push_back( |
| 274 new ChromeLauncherAppMenuItem(base::string16(), NULL, false)); | 274 new ChromeLauncherAppMenuItem(base::string16(), NULL, false)); |
| 275 items.push_back( | 275 items.push_back( |
| 276 new ChromeLauncherAppMenuItem(base::string16(), NULL, false)); | 276 new ChromeLauncherAppMenuItem(base::string16(), NULL, false)); |
| 277 return items; | 277 return items; |
| 278 } | 278 } |
| 279 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override { | 279 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override { |
| 280 return NULL; | 280 return NULL; |
| 281 } | 281 } |
| 282 bool IsDraggable() override { return false; } | |
| 283 bool CanPin() const override { | 282 bool CanPin() const override { |
| 284 return GetPinnableForAppID(app_id(), launcher_controller()->profile()) == | 283 return GetPinnableForAppID(app_id(), launcher_controller()->profile()) == |
| 285 AppListControllerDelegate::PIN_EDITABLE; | 284 AppListControllerDelegate::PIN_EDITABLE; |
| 286 } | 285 } |
| 287 | 286 |
| 288 private: | 287 private: |
| 289 DISALLOW_COPY_AND_ASSIGN(TestV2AppLauncherItemController); | 288 DISALLOW_COPY_AND_ASSIGN(TestV2AppLauncherItemController); |
| 290 }; | 289 }; |
| 291 | 290 |
| 292 } // namespace | 291 } // namespace |
| (...skipping 3777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4070 | 4069 |
| 4071 // Pinned state should not change. | 4070 // Pinned state should not change. |
| 4072 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); | 4071 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); |
| 4073 launcher_controller_->UnpinAppWithID(extension2_->id()); | 4072 launcher_controller_->UnpinAppWithID(extension2_->id()); |
| 4074 EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus()); | 4073 EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus()); |
| 4075 | 4074 |
| 4076 // Resume syncing and sync information overrides local copy. | 4075 // Resume syncing and sync information overrides local copy. |
| 4077 StartAppSyncService(copy_sync_list); | 4076 StartAppSyncService(copy_sync_list); |
| 4078 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); | 4077 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); |
| 4079 } | 4078 } |
| OLD | NEW |