| 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 "ash/shelf/shelf_item_delegate_manager.h" | 7 #include "ash/shelf/shelf_item_delegate_manager.h" |
| 8 #include "ash/shelf/shelf_model.h" | 8 #include "ash/shelf/shelf_model.h" |
| 9 #include "ash/shelf/shelf_util.h" | 9 #include "ash/shelf/shelf_util.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/test/test_shelf_item_delegate.h" | 11 #include "ash/test/test_shelf_item_delegate.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "grit/ash_resources.h" | |
| 15 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
| 16 | 15 |
| 17 namespace ash { | 16 namespace ash { |
| 18 namespace test { | 17 namespace test { |
| 19 | 18 |
| 20 TestShelfDelegate* TestShelfDelegate::instance_ = NULL; | 19 TestShelfDelegate* TestShelfDelegate::instance_ = NULL; |
| 21 | 20 |
| 22 TestShelfDelegate::TestShelfDelegate(ShelfModel* model) | 21 TestShelfDelegate::TestShelfDelegate(ShelfModel* model) |
| 23 : model_(model) { | 22 : model_(model) { |
| 24 CHECK(!instance_); | 23 CHECK(!instance_); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 | 98 |
| 100 bool TestShelfDelegate::IsAppPinned(const std::string& app_id) { | 99 bool TestShelfDelegate::IsAppPinned(const std::string& app_id) { |
| 101 return false; | 100 return false; |
| 102 } | 101 } |
| 103 | 102 |
| 104 void TestShelfDelegate::UnpinAppWithID(const std::string& app_id) { | 103 void TestShelfDelegate::UnpinAppWithID(const std::string& app_id) { |
| 105 } | 104 } |
| 106 | 105 |
| 107 } // namespace test | 106 } // namespace test |
| 108 } // namespace ash | 107 } // namespace ash |
| OLD | NEW |