| 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/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/shelf/shelf_model.h" | 10 #include "ash/shelf/shelf_model.h" |
| 11 #include "ash/shelf/wm_shelf.h" | 11 #include "ash/shelf/wm_shelf.h" |
| 12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 13 #include "ash/shell_observer.h" | 13 #include "ash/shell_observer.h" |
| 14 #include "ash/test/test_shelf_item_delegate.h" | 14 #include "ash/test/test_shelf_item_delegate.h" |
| 15 #include "ash/wm/window_properties.h" | 15 #include "ash/wm/window_properties.h" |
| 16 #include "ash/wm_shell.h" | |
| 17 #include "ash/wm_window.h" | 16 #include "ash/wm_window.h" |
| 18 #include "base/memory/ptr_util.h" | 17 #include "base/memory/ptr_util.h" |
| 19 #include "ui/aura/window.h" | 18 #include "ui/aura/window.h" |
| 20 | 19 |
| 21 namespace ash { | 20 namespace ash { |
| 22 namespace test { | 21 namespace test { |
| 23 | 22 |
| 24 namespace { | 23 namespace { |
| 25 | 24 |
| 26 // Set the |type| of the item with the given |shelf_id|, if the item exists. | 25 // Set the |type| of the item with the given |shelf_id|, if the item exists. |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 return pinned_apps_.find(app_id) != pinned_apps_.end(); | 155 return pinned_apps_.find(app_id) != pinned_apps_.end(); |
| 157 } | 156 } |
| 158 | 157 |
| 159 void TestShelfDelegate::UnpinAppWithID(const std::string& app_id) { | 158 void TestShelfDelegate::UnpinAppWithID(const std::string& app_id) { |
| 160 SetItemType(GetShelfIDForAppID(app_id), TYPE_APP); | 159 SetItemType(GetShelfIDForAppID(app_id), TYPE_APP); |
| 161 pinned_apps_.erase(app_id); | 160 pinned_apps_.erase(app_id); |
| 162 } | 161 } |
| 163 | 162 |
| 164 } // namespace test | 163 } // namespace test |
| 165 } // namespace ash | 164 } // namespace ash |
| OLD | NEW |