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 <string> | 5 #include <string> |
6 | 6 |
| 7 #include "ash/session_state_delegate.h" |
7 #include "ash/shell.h" | 8 #include "ash/shell.h" |
8 #include "ash/shell/example_factory.h" | 9 #include "ash/shell/example_factory.h" |
9 #include "ash/shell/toplevel_window.h" | 10 #include "ash/shell/toplevel_window.h" |
10 #include "ash/shell_delegate.h" | |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/i18n/case_conversion.h" | 12 #include "base/i18n/case_conversion.h" |
13 #include "base/i18n/string_search.h" | 13 #include "base/i18n/string_search.h" |
14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
16 #include "ui/app_list/app_list_item_model.h" | 16 #include "ui/app_list/app_list_item_model.h" |
17 #include "ui/app_list/app_list_model.h" | 17 #include "ui/app_list/app_list_model.h" |
18 #include "ui/app_list/app_list_view_delegate.h" | 18 #include "ui/app_list/app_list_view_delegate.h" |
19 #include "ui/app_list/search_box_model.h" | 19 #include "ui/app_list/search_box_model.h" |
20 #include "ui/app_list/search_result.h" | 20 #include "ui/app_list/search_result.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 ToplevelWindow::CreateParams params; | 102 ToplevelWindow::CreateParams params; |
103 params.can_resize = true; | 103 params.can_resize = true; |
104 ToplevelWindow::CreateToplevelWindow(params); | 104 ToplevelWindow::CreateToplevelWindow(params); |
105 break; | 105 break; |
106 } | 106 } |
107 case NON_RESIZABLE_WINDOW: { | 107 case NON_RESIZABLE_WINDOW: { |
108 ToplevelWindow::CreateToplevelWindow(ToplevelWindow::CreateParams()); | 108 ToplevelWindow::CreateToplevelWindow(ToplevelWindow::CreateParams()); |
109 break; | 109 break; |
110 } | 110 } |
111 case LOCK_SCREEN: { | 111 case LOCK_SCREEN: { |
112 Shell::GetInstance()->delegate()->LockScreen(); | 112 Shell::GetInstance()->session_state_delegate()->LockScreen(); |
113 break; | 113 break; |
114 } | 114 } |
115 case WIDGETS_WINDOW: { | 115 case WIDGETS_WINDOW: { |
116 CreateWidgetsWindow(); | 116 CreateWidgetsWindow(); |
117 break; | 117 break; |
118 } | 118 } |
119 case EXAMPLES_WINDOW: { | 119 case EXAMPLES_WINDOW: { |
120 #if !defined(OS_MACOSX) | 120 #if !defined(OS_MACOSX) |
121 views::examples::ShowExamplesWindowWithContent( | 121 views::examples::ShowExamplesWindowWithContent( |
122 views::examples::DO_NOTHING_ON_CLOSE, | 122 views::examples::DO_NOTHING_ON_CLOSE, |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 }; | 317 }; |
318 | 318 |
319 } // namespace | 319 } // namespace |
320 | 320 |
321 app_list::AppListViewDelegate* CreateAppListViewDelegate() { | 321 app_list::AppListViewDelegate* CreateAppListViewDelegate() { |
322 return new ExampleAppListViewDelegate; | 322 return new ExampleAppListViewDelegate; |
323 } | 323 } |
324 | 324 |
325 } // namespace shell | 325 } // namespace shell |
326 } // namespace ash | 326 } // namespace ash |
OLD | NEW |