Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Side by Side Diff: services/navigation/content_client/browser_main_parts.cc

Issue 2027093002: mus: Initialize WindowManagerConnection in chrome instead of in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « services/navigation/content_client/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
8 #include "content/public/common/mojo_shell_connection.h" 8 #include "content/public/common/mojo_shell_connection.h"
9 #include "content/shell/browser/shell_browser_context.h" 9 #include "content/shell/browser/shell_browser_context.h"
10 #include "content/shell/browser/shell_net_log.h" 10 #include "content/shell/browser/shell_net_log.h"
11 #include "services/navigation/navigation.h" 11 #include "services/navigation/navigation.h"
12 #include "ui/views/mus/window_manager_connection.h"
12 #include "ui/views/test/test_views_delegate.h" 13 #include "ui/views/test/test_views_delegate.h"
13 14
14 namespace navigation { 15 namespace navigation {
15 16
16 BrowserMainParts::BrowserMainParts( 17 BrowserMainParts::BrowserMainParts(
17 const content::MainFunctionParams& parameters) {} 18 const content::MainFunctionParams& parameters) {}
18 BrowserMainParts::~BrowserMainParts() {} 19 BrowserMainParts::~BrowserMainParts() {}
19 20
20 void BrowserMainParts::ToolkitInitialized() { 21 void BrowserMainParts::ToolkitInitialized() {
21 if (!views::ViewsDelegate::GetInstance()) 22 if (!views::ViewsDelegate::GetInstance())
22 views_delegate_.reset(new views::TestViewsDelegate); 23 views_delegate_.reset(new views::TestViewsDelegate);
23 } 24 }
24 25
25 void BrowserMainParts::PreMainMessageLoopRun() { 26 void BrowserMainParts::PreMainMessageLoopRun() {
27 content::MojoShellConnection* mojo_shell_connection =
28 content::MojoShellConnection::Get();
29 if (mojo_shell_connection) {
30 views::WindowManagerConnection::Create(
31 mojo_shell_connection->GetConnector(),
32 mojo_shell_connection->GetIdentity());
33 }
26 net_log_.reset(new content::ShellNetLog("ash_shell")); 34 net_log_.reset(new content::ShellNetLog("ash_shell"));
27 browser_context_.reset( 35 browser_context_.reset(
28 new content::ShellBrowserContext(false, net_log_.get())); 36 new content::ShellBrowserContext(false, net_log_.get()));
29 navigation_->Init(content::MojoShellConnection::Get()->GetConnector(), 37 navigation_->Init(mojo_shell_connection->GetConnector(), browser_context());
30 browser_context());
31 } 38 }
32 39
33 void BrowserMainParts::PostMainMessageLoopRun() { 40 void BrowserMainParts::PostMainMessageLoopRun() {
34 views_delegate_.reset(); 41 views_delegate_.reset();
35 browser_context_.reset(); 42 browser_context_.reset();
36 } 43 }
37 44
38 bool BrowserMainParts::MainMessageLoopRun(int* result_code) { 45 bool BrowserMainParts::MainMessageLoopRun(int* result_code) {
39 base::MessageLoop::current()->Run(); 46 base::MessageLoop::current()->Run();
40 return true; 47 return true;
41 } 48 }
42 49
43 } // namespace navigation 50 } // namespace navigation
OLDNEW
« no previous file with comments | « services/navigation/content_client/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698