| 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 "ash/test/test_shelf_delegate.h" | 5 #include "ash/test/test_shelf_delegate.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/shelf/shelf_item_delegate_manager.h" | 9 #include "ash/common/shelf/shelf_item_delegate_manager.h" |
| 10 #include "ash/shelf/shelf_model.h" | 10 #include "ash/common/shelf/shelf_model.h" |
| 11 #include "ash/shelf/shelf_util.h" | 11 #include "ash/shelf/shelf_util.h" |
| 12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 13 #include "ash/test/test_shelf_item_delegate.h" | 13 #include "ash/test/test_shelf_item_delegate.h" |
| 14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
| 15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
| 17 | 17 |
| 18 namespace ash { | 18 namespace ash { |
| 19 namespace test { | 19 namespace test { |
| 20 | 20 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 const std::string& app_id) { | 136 const std::string& app_id) { |
| 137 shelf_id_to_app_id_map_[shelf_id] = app_id; | 137 shelf_id_to_app_id_map_[shelf_id] = app_id; |
| 138 } | 138 } |
| 139 | 139 |
| 140 void TestShelfDelegate::RemoveShelfIDToAppIDMapping(ShelfID shelf_id) { | 140 void TestShelfDelegate::RemoveShelfIDToAppIDMapping(ShelfID shelf_id) { |
| 141 shelf_id_to_app_id_map_.erase(shelf_id); | 141 shelf_id_to_app_id_map_.erase(shelf_id); |
| 142 } | 142 } |
| 143 | 143 |
| 144 } // namespace test | 144 } // namespace test |
| 145 } // namespace ash | 145 } // namespace ash |
| OLD | NEW |