| 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_delegate.h" | 8 #include "ash/app_list/app_list_view_delegate.h" |
| 9 #include "ash/app_list/app_list_view.h" | 9 #include "ash/app_list/app_list_view.h" |
| 10 #include "ash/shell.h" |
| 11 #include "ash/shell_delegate.h" |
| 10 #include "ash/shell/example_factory.h" | 12 #include "ash/shell/example_factory.h" |
| 11 #include "ash/shell/toplevel_window.h" | 13 #include "ash/shell/toplevel_window.h" |
| 12 #include "base/basictypes.h" | 14 #include "base/basictypes.h" |
| 13 #include "ui/views/examples/examples_window.h" | 15 #include "ui/views/examples/examples_window.h" |
| 14 | 16 |
| 15 namespace ash { | 17 namespace ash { |
| 16 namespace shell { | 18 namespace shell { |
| 17 | 19 |
| 18 namespace { | 20 namespace { |
| 19 | 21 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 ToplevelWindow::CreateParams params; | 75 ToplevelWindow::CreateParams params; |
| 74 params.can_resize = true; | 76 params.can_resize = true; |
| 75 ToplevelWindow::CreateToplevelWindow(params); | 77 ToplevelWindow::CreateToplevelWindow(params); |
| 76 break; | 78 break; |
| 77 } | 79 } |
| 78 case NON_RESIZABLE_WINDOW: { | 80 case NON_RESIZABLE_WINDOW: { |
| 79 ToplevelWindow::CreateToplevelWindow(ToplevelWindow::CreateParams()); | 81 ToplevelWindow::CreateToplevelWindow(ToplevelWindow::CreateParams()); |
| 80 break; | 82 break; |
| 81 } | 83 } |
| 82 case LOCK_SCREEN: { | 84 case LOCK_SCREEN: { |
| 83 CreateLockScreen(); | 85 Shell::GetInstance()->delegate()->LockScreen(); |
| 84 break; | 86 break; |
| 85 } | 87 } |
| 86 case WIDGETS_WINDOW: { | 88 case WIDGETS_WINDOW: { |
| 87 CreateWidgetsWindow(); | 89 CreateWidgetsWindow(); |
| 88 break; | 90 break; |
| 89 } | 91 } |
| 90 case EXAMPLES_WINDOW: { | 92 case EXAMPLES_WINDOW: { |
| 91 #if !defined(OS_MACOSX) | 93 #if !defined(OS_MACOSX) |
| 92 views::examples::ShowExamplesWindow(false); | 94 views::examples::ShowExamplesWindow(false); |
| 93 #endif | 95 #endif |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 }; | 142 }; |
| 141 | 143 |
| 142 } // namespace | 144 } // namespace |
| 143 | 145 |
| 144 ash::AppListViewDelegate* CreateAppListViewDelegate() { | 146 ash::AppListViewDelegate* CreateAppListViewDelegate() { |
| 145 return new ExampleAppListViewDelegate; | 147 return new ExampleAppListViewDelegate; |
| 146 } | 148 } |
| 147 | 149 |
| 148 } // namespace shell | 150 } // namespace shell |
| 149 } // namespace ash | 151 } // namespace ash |
| OLD | NEW |