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/public/browser/browser_main_runner.h" | 5 #include "content/public/browser/browser_main_runner.h" |
6 | 6 |
7 #include "base/allocator/allocator_shim.h" | 7 #include "base/allocator/allocator_shim.h" |
8 #include "base/base_switches.h" | 8 #include "base/base_switches.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/leak_annotations.h" | 10 #include "base/debug/leak_annotations.h" |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 main_loop_->ShutdownThreadsAndCleanUp(); | 286 main_loop_->ShutdownThreadsAndCleanUp(); |
287 | 287 |
288 ui::ShutdownInputMethod(); | 288 ui::ShutdownInputMethod(); |
289 #if defined(OS_WIN) | 289 #if defined(OS_WIN) |
290 ole_initializer_.reset(NULL); | 290 ole_initializer_.reset(NULL); |
291 #endif | 291 #endif |
292 #if defined(OS_ANDROID) | 292 #if defined(OS_ANDROID) |
293 // Forcefully terminates the RunLoop inside MessagePumpForUI, ensuring | 293 // Forcefully terminates the RunLoop inside MessagePumpForUI, ensuring |
294 // proper shutdown for content_browsertests. Shutdown() is not used by | 294 // proper shutdown for content_browsertests. Shutdown() is not used by |
295 // the actual browser. | 295 // the actual browser. |
296 base::MessageLoop::current()->QuitNow(); | 296 if (base::MessageLoop::current()->is_running()) |
| 297 base::MessageLoop::current()->QuitNow(); |
297 #endif | 298 #endif |
298 main_loop_.reset(NULL); | 299 main_loop_.reset(NULL); |
299 | 300 |
300 notification_service_.reset(NULL); | 301 notification_service_.reset(NULL); |
301 | 302 |
302 is_shutdown_ = true; | 303 is_shutdown_ = true; |
303 } | 304 } |
304 } | 305 } |
305 | 306 |
306 protected: | 307 protected: |
(...skipping 11 matching lines...) Expand all Loading... |
318 | 319 |
319 DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl); | 320 DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl); |
320 }; | 321 }; |
321 | 322 |
322 // static | 323 // static |
323 BrowserMainRunner* BrowserMainRunner::Create() { | 324 BrowserMainRunner* BrowserMainRunner::Create() { |
324 return new BrowserMainRunnerImpl(); | 325 return new BrowserMainRunnerImpl(); |
325 } | 326 } |
326 | 327 |
327 } // namespace content | 328 } // namespace content |
OLD | NEW |