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 "content/shell/shell_browser_main_parts.h" | 5 #include "content/shell/shell_browser_main_parts.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 delete parameters_.ui_task; | 97 delete parameters_.ui_task; |
98 run_message_loop_ = false; | 98 run_message_loop_ = false; |
99 } | 99 } |
100 } | 100 } |
101 | 101 |
102 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { | 102 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
103 return !run_message_loop_; | 103 return !run_message_loop_; |
104 } | 104 } |
105 | 105 |
106 void ShellBrowserMainParts::PostMainMessageLoopRun() { | 106 void ShellBrowserMainParts::PostMainMessageLoopRun() { |
| 107 #if defined(USE_AURA) |
| 108 Shell::PlatformExit(); |
| 109 #endif |
107 if (devtools_delegate_) | 110 if (devtools_delegate_) |
108 devtools_delegate_->Stop(); | 111 devtools_delegate_->Stop(); |
109 browser_context_.reset(); | 112 browser_context_.reset(); |
110 } | 113 } |
111 | 114 |
112 } // namespace | 115 } // namespace |
OLD | NEW |