| 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/ash_switches.h" | 7 #include "ash/common/ash_switches.h" |
| 8 #include "ash/common/login_status.h" | 8 #include "ash/common/login_status.h" |
| 9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
| 10 #include "ash/content/shell_content_state.h" | 10 #include "ash/content/shell_content_state.h" |
| 11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 12 #include "ash/shell/content/shell_content_state_impl.h" | 12 #include "ash/shell/content/shell_content_state_impl.h" |
| 13 #include "ash/shell/shell_delegate_impl.h" | 13 #include "ash/shell/shell_delegate_impl.h" |
| 14 #include "ash/shell/window_watcher.h" | 14 #include "ash/shell/window_watcher.h" |
| 15 #include "ash/shell_init_params.h" | 15 #include "ash/shell_init_params.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/strings/string_number_conversions.h" | 21 #include "base/strings/string_number_conversions.h" |
| 21 #include "base/threading/thread.h" | 22 #include "base/threading/thread.h" |
| 22 #include "base/threading/thread_restrictions.h" | 23 #include "base/threading/thread_restrictions.h" |
| 23 #include "content/public/browser/browser_thread.h" | 24 #include "content/public/browser/browser_thread.h" |
| 24 #include "content/public/browser/context_factory.h" | 25 #include "content/public/browser/context_factory.h" |
| 25 #include "content/public/common/content_switches.h" | 26 #include "content/public/common/content_switches.h" |
| 26 #include "content/shell/browser/shell_browser_context.h" | 27 #include "content/shell/browser/shell_browser_context.h" |
| 27 #include "content/shell/browser/shell_net_log.h" | 28 #include "content/shell/browser/shell_net_log.h" |
| 28 #include "net/base/net_module.h" | 29 #include "net/base/net_module.h" |
| 29 #include "ui/aura/env.h" | 30 #include "ui/aura/env.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 views_delegate_.reset(); | 165 views_delegate_.reset(); |
| 165 | 166 |
| 166 // The keyboard may have created a WebContents. The WebContents is destroyed | 167 // The keyboard may have created a WebContents. The WebContents is destroyed |
| 167 // with the UI, and it needs the BrowserContext to be alive during its | 168 // with the UI, and it needs the BrowserContext to be alive during its |
| 168 // destruction. So destroy all of the UI elements before destroying the | 169 // destruction. So destroy all of the UI elements before destroying the |
| 169 // browser context. | 170 // browser context. |
| 170 browser_context_.reset(); | 171 browser_context_.reset(); |
| 171 } | 172 } |
| 172 | 173 |
| 173 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { | 174 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
| 174 base::MessageLoop::current()->Run(); | 175 base::RunLoop().Run(); |
| 175 return true; | 176 return true; |
| 176 } | 177 } |
| 177 | 178 |
| 178 } // namespace shell | 179 } // namespace shell |
| 179 } // namespace ash | 180 } // namespace ash |
| OLD | NEW |