OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/navigation/content_client/browser_main_parts.h" | 5 #include "services/navigation/content_client/browser_main_parts.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
jam
2016/08/05 19:56:43
nit: remove this and also in other files?
fdoray
2016/08/05 23:41:36
Done. Our script should have removed this include
| |
8 #include "base/run_loop.h" | |
8 #include "content/public/common/mojo_shell_connection.h" | 9 #include "content/public/common/mojo_shell_connection.h" |
9 #include "content/shell/browser/shell_browser_context.h" | 10 #include "content/shell/browser/shell_browser_context.h" |
10 #include "content/shell/browser/shell_net_log.h" | 11 #include "content/shell/browser/shell_net_log.h" |
11 #include "services/navigation/navigation.h" | 12 #include "services/navigation/navigation.h" |
12 #include "ui/views/mus/window_manager_connection.h" | 13 #include "ui/views/mus/window_manager_connection.h" |
13 #include "ui/views/test/test_views_delegate.h" | 14 #include "ui/views/test/test_views_delegate.h" |
14 | 15 |
15 namespace navigation { | 16 namespace navigation { |
16 | 17 |
17 BrowserMainParts::BrowserMainParts( | 18 BrowserMainParts::BrowserMainParts( |
(...skipping 17 matching lines...) Expand all Loading... | |
35 browser_context_.reset( | 36 browser_context_.reset( |
36 new content::ShellBrowserContext(false, net_log_.get())); | 37 new content::ShellBrowserContext(false, net_log_.get())); |
37 } | 38 } |
38 | 39 |
39 void BrowserMainParts::PostMainMessageLoopRun() { | 40 void BrowserMainParts::PostMainMessageLoopRun() { |
40 views_delegate_.reset(); | 41 views_delegate_.reset(); |
41 browser_context_.reset(); | 42 browser_context_.reset(); |
42 } | 43 } |
43 | 44 |
44 bool BrowserMainParts::MainMessageLoopRun(int* result_code) { | 45 bool BrowserMainParts::MainMessageLoopRun(int* result_code) { |
45 base::MessageLoop::current()->Run(); | 46 base::RunLoop().Run(); |
46 return true; | 47 return true; |
47 } | 48 } |
48 | 49 |
49 } // namespace navigation | 50 } // namespace navigation |
OLD | NEW |