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/shell/content/client/shell_browser_main_parts.h" | 5 #include "ash/shell/content/client/shell_browser_main_parts.h" |
6 | 6 |
7 #include "ash/common/login_status.h" | |
8 #include "ash/common/wm_shell.h" | |
9 #include "ash/content/shell_content_state.h" | 7 #include "ash/content/shell_content_state.h" |
| 8 #include "ash/login_status.h" |
10 #include "ash/shell.h" | 9 #include "ash/shell.h" |
11 #include "ash/shell/content/shell_content_state_impl.h" | 10 #include "ash/shell/content/shell_content_state_impl.h" |
12 #include "ash/shell/example_app_list_presenter.h" | 11 #include "ash/shell/example_app_list_presenter.h" |
13 #include "ash/shell/shell_delegate_impl.h" | 12 #include "ash/shell/shell_delegate_impl.h" |
14 #include "ash/shell/window_watcher.h" | 13 #include "ash/shell/window_watcher.h" |
15 #include "ash/shell_init_params.h" | 14 #include "ash/shell_init_params.h" |
| 15 #include "ash/wm_shell.h" |
16 #include "base/bind.h" | 16 #include "base/bind.h" |
17 #include "base/command_line.h" | 17 #include "base/command_line.h" |
18 #include "base/i18n/icu_util.h" | 18 #include "base/i18n/icu_util.h" |
19 #include "base/message_loop/message_loop.h" | 19 #include "base/message_loop/message_loop.h" |
20 #include "base/run_loop.h" | 20 #include "base/run_loop.h" |
21 #include "base/strings/string_number_conversions.h" | 21 #include "base/strings/string_number_conversions.h" |
22 #include "base/threading/thread.h" | 22 #include "base/threading/thread.h" |
23 #include "base/threading/thread_restrictions.h" | 23 #include "base/threading/thread_restrictions.h" |
24 #include "chromeos/audio/cras_audio_handler.h" | 24 #include "chromeos/audio/cras_audio_handler.h" |
25 #include "chromeos/dbus/dbus_thread_manager.h" | 25 #include "chromeos/dbus/dbus_thread_manager.h" |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 browser_context_.reset(); | 169 browser_context_.reset(); |
170 } | 170 } |
171 | 171 |
172 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { | 172 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
173 base::RunLoop().Run(); | 173 base::RunLoop().Run(); |
174 return true; | 174 return true; |
175 } | 175 } |
176 | 176 |
177 } // namespace shell | 177 } // namespace shell |
178 } // namespace ash | 178 } // namespace ash |
OLD | NEW |