| 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/app_list/app_list_item_model.h" | 5 #include "ash/app_list/app_list_item_model.h" |
| 6 #include "ash/app_list/app_list_item_view.h" | 6 #include "ash/app_list/app_list_item_view.h" |
| 7 #include "ash/app_list/app_list_model.h" | 7 #include "ash/app_list/app_list_model.h" |
| 8 #include "ash/app_list/app_list_view.h" | 8 #include "ash/app_list/app_list_view.h" |
| 9 #include "ash/app_list/app_list_view_delegate.h" | 9 #include "ash/app_list/app_list_view_delegate.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 Shell::GetInstance()->delegate()->LockScreen(); | 85 Shell::GetInstance()->delegate()->LockScreen(); |
| 86 break; | 86 break; |
| 87 } | 87 } |
| 88 case WIDGETS_WINDOW: { | 88 case WIDGETS_WINDOW: { |
| 89 CreateWidgetsWindow(); | 89 CreateWidgetsWindow(); |
| 90 break; | 90 break; |
| 91 } | 91 } |
| 92 case EXAMPLES_WINDOW: { | 92 case EXAMPLES_WINDOW: { |
| 93 #if !defined(OS_MACOSX) | 93 #if !defined(OS_MACOSX) |
| 94 views::examples::ShowExamplesWindow( | 94 views::examples::ShowExamplesWindow( |
| 95 views::examples::DO_NOTHING_ON_CLOSE, NULL); | 95 views::examples::DO_NOTHING_ON_CLOSE, |
| 96 ash::Shell::GetInstance()->browser_context()); |
| 96 #endif | 97 #endif |
| 97 break; | 98 break; |
| 98 } | 99 } |
| 99 default: | 100 default: |
| 100 break; | 101 break; |
| 101 } | 102 } |
| 102 } | 103 } |
| 103 | 104 |
| 104 private: | 105 private: |
| 105 Type type_; | 106 Type type_; |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 }; | 144 }; |
| 144 | 145 |
| 145 } // namespace | 146 } // namespace |
| 146 | 147 |
| 147 ash::AppListViewDelegate* CreateAppListViewDelegate() { | 148 ash::AppListViewDelegate* CreateAppListViewDelegate() { |
| 148 return new ExampleAppListViewDelegate; | 149 return new ExampleAppListViewDelegate; |
| 149 } | 150 } |
| 150 | 151 |
| 151 } // namespace shell | 152 } // namespace shell |
| 152 } // namespace ash | 153 } // namespace ash |
| OLD | NEW |