| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/common/shelf/shelf_view.h" | 5 #include "ash/common/shelf/shelf_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 | 263 |
| 264 bool HasShelfIDToAppIDMapping(ShelfID id) const override { return true; } | 264 bool HasShelfIDToAppIDMapping(ShelfID id) const override { return true; } |
| 265 | 265 |
| 266 const std::string& GetAppIDForShelfID(ShelfID id) override { | 266 const std::string& GetAppIDForShelfID(ShelfID id) override { |
| 267 // Use |app_id_| member variable because returning a reference to local | 267 // Use |app_id_| member variable because returning a reference to local |
| 268 // variable is not allowed. | 268 // variable is not allowed. |
| 269 app_id_ = base::IntToString(id); | 269 app_id_ = base::IntToString(id); |
| 270 return app_id_; | 270 return app_id_; |
| 271 } | 271 } |
| 272 | 272 |
| 273 const std::string& GetLaunchIDForShelfID(ShelfID id) override { |
| 274 return base::EmptyString(); |
| 275 } |
| 276 |
| 273 void PinAppWithID(const std::string& app_id) override { NOTREACHED(); } | 277 void PinAppWithID(const std::string& app_id) override { NOTREACHED(); } |
| 274 | 278 |
| 275 bool IsAppPinned(const std::string& app_id) override { | 279 bool IsAppPinned(const std::string& app_id) override { |
| 276 return is_app_pinned_; | 280 return is_app_pinned_; |
| 277 } | 281 } |
| 278 | 282 |
| 279 void UnpinAppWithID(const std::string& app_id) override { NOTREACHED(); } | 283 void UnpinAppWithID(const std::string& app_id) override { NOTREACHED(); } |
| 280 | 284 |
| 281 private: | 285 private: |
| 282 // Tracks whether apps are pinned or not. | 286 // Tracks whether apps are pinned or not. |
| (...skipping 2876 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3159 IsEmpty()); | 3163 IsEmpty()); |
| 3160 | 3164 |
| 3161 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); | 3165 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); |
| 3162 } | 3166 } |
| 3163 } | 3167 } |
| 3164 | 3168 |
| 3165 #endif // !defined(OS_WIN) | 3169 #endif // !defined(OS_WIN) |
| 3166 | 3170 |
| 3167 } // namespace test | 3171 } // namespace test |
| 3168 } // namespace ash | 3172 } // namespace ash |
| OLD | NEW |