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 <memory> | 5 #include <memory> |
6 #include <string> | 6 #include <string> |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_controller.h" |
11 #include "ash/common/wm_shell.h" | 11 #include "ash/common/wm_shell.h" |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
13 #include "ash/shell/example_factory.h" | 13 #include "ash/shell/example_factory.h" |
14 #include "ash/shell/toplevel_window.h" | 14 #include "ash/shell/toplevel_window.h" |
15 #include "base/callback.h" | 15 #include "base/callback.h" |
16 #include "base/files/file_path.h" | 16 #include "base/files/file_path.h" |
17 #include "base/i18n/case_conversion.h" | 17 #include "base/i18n/case_conversion.h" |
18 #include "base/i18n/string_search.h" | 18 #include "base/i18n/string_search.h" |
19 #include "base/memory/ptr_util.h" | 19 #include "base/memory/ptr_util.h" |
20 #include "base/strings/string_number_conversions.h" | 20 #include "base/strings/string_number_conversions.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 ToplevelWindow::CreateParams params; | 105 ToplevelWindow::CreateParams params; |
106 params.can_resize = true; | 106 params.can_resize = true; |
107 ToplevelWindow::CreateToplevelWindow(params); | 107 ToplevelWindow::CreateToplevelWindow(params); |
108 break; | 108 break; |
109 } | 109 } |
110 case NON_RESIZABLE_WINDOW: { | 110 case NON_RESIZABLE_WINDOW: { |
111 ToplevelWindow::CreateToplevelWindow(ToplevelWindow::CreateParams()); | 111 ToplevelWindow::CreateToplevelWindow(ToplevelWindow::CreateParams()); |
112 break; | 112 break; |
113 } | 113 } |
114 case LOCK_SCREEN: { | 114 case LOCK_SCREEN: { |
115 WmShell::Get()->GetSessionStateDelegate()->LockScreen(); | 115 WmShell::Get()->session_controller()->LockScreen(); |
116 break; | 116 break; |
117 } | 117 } |
118 case WIDGETS_WINDOW: { | 118 case WIDGETS_WINDOW: { |
119 CreateWidgetsWindow(); | 119 CreateWidgetsWindow(); |
120 break; | 120 break; |
121 } | 121 } |
122 case EXAMPLES_WINDOW: { | 122 case EXAMPLES_WINDOW: { |
123 views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE); | 123 views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE); |
124 break; | 124 break; |
125 } | 125 } |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 }; | 328 }; |
329 | 329 |
330 } // namespace | 330 } // namespace |
331 | 331 |
332 app_list::AppListViewDelegate* CreateAppListViewDelegate() { | 332 app_list::AppListViewDelegate* CreateAppListViewDelegate() { |
333 return new ExampleAppListViewDelegate; | 333 return new ExampleAppListViewDelegate; |
334 } | 334 } |
335 | 335 |
336 } // namespace shell | 336 } // namespace shell |
337 } // namespace ash | 337 } // namespace ash |
OLD | NEW |