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" |
(...skipping 18 matching lines...) Expand all Loading... |
29 instance_ = NULL; | 29 instance_ = NULL; |
30 } | 30 } |
31 | 31 |
32 void TestShelfDelegate::AddLauncherItem(aura::Window* window) { | 32 void TestShelfDelegate::AddLauncherItem(aura::Window* window) { |
33 AddLauncherItem(window, STATUS_CLOSED); | 33 AddLauncherItem(window, STATUS_CLOSED); |
34 } | 34 } |
35 | 35 |
36 void TestShelfDelegate::AddLauncherItem(aura::Window* window, | 36 void TestShelfDelegate::AddLauncherItem(aura::Window* window, |
37 LauncherItemStatus status) { | 37 LauncherItemStatus status) { |
38 LauncherItem item; | 38 LauncherItem item; |
39 if (window->type() == aura::client::WINDOW_TYPE_PANEL) | 39 if (window->type() == ui::wm::WINDOW_TYPE_PANEL) |
40 item.type = TYPE_APP_PANEL; | 40 item.type = TYPE_APP_PANEL; |
41 else | 41 else |
42 item.type = TYPE_PLATFORM_APP; | 42 item.type = TYPE_PLATFORM_APP; |
43 LauncherID id = model_->next_id(); | 43 LauncherID id = model_->next_id(); |
44 item.status = status; | 44 item.status = status; |
45 model_->Add(item); | 45 model_->Add(item); |
46 window->AddObserver(this); | 46 window->AddObserver(this); |
47 | 47 |
48 ShelfItemDelegateManager* manager = | 48 ShelfItemDelegateManager* manager = |
49 Shell::GetInstance()->shelf_item_delegate_manager(); | 49 Shell::GetInstance()->shelf_item_delegate_manager(); |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 | 99 |
100 bool TestShelfDelegate::IsAppPinned(const std::string& app_id) { | 100 bool TestShelfDelegate::IsAppPinned(const std::string& app_id) { |
101 return false; | 101 return false; |
102 } | 102 } |
103 | 103 |
104 void TestShelfDelegate::UnpinAppWithID(const std::string& app_id) { | 104 void TestShelfDelegate::UnpinAppWithID(const std::string& app_id) { |
105 } | 105 } |
106 | 106 |
107 } // namespace test | 107 } // namespace test |
108 } // namespace ash | 108 } // namespace ash |
OLD | NEW |