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

Side by Side Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Issue 2026623002: views/mus: Have explicit ownership of views::WindowManagerConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge 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 | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h ('k') | mash/browser/browser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 5 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
6 6
7 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" 7 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
8 #include "chrome/browser/ui/views/chrome_views_delegate.h" 8 #include "chrome/browser/ui/views/chrome_views_delegate.h"
9 #include "components/constrained_window/constrained_window_views.h" 9 #include "components/constrained_window/constrained_window_views.h"
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 43 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
44 display::Screen::SetScreenInstance(views::CreateDesktopScreen()); 44 display::Screen::SetScreenInstance(views::CreateDesktopScreen());
45 #endif 45 #endif
46 } 46 }
47 47
48 void ChromeBrowserMainExtraPartsViews::PreProfileInit() { 48 void ChromeBrowserMainExtraPartsViews::PreProfileInit() {
49 #if defined(USE_AURA) && defined(MOJO_SHELL_CLIENT) 49 #if defined(USE_AURA) && defined(MOJO_SHELL_CLIENT)
50 content::MojoShellConnection* mojo_shell_connection = 50 content::MojoShellConnection* mojo_shell_connection =
51 content::MojoShellConnection::Get(); 51 content::MojoShellConnection::Get();
52 if (mojo_shell_connection && mojo_shell_connection->UsingExternalShell()) { 52 if (mojo_shell_connection && mojo_shell_connection->UsingExternalShell()) {
53 views::WindowManagerConnection::Create( 53 window_manager_connection_ = views::WindowManagerConnection::Create(
54 mojo_shell_connection->GetConnector(), 54 mojo_shell_connection->GetConnector(),
55 mojo_shell_connection->GetIdentity()); 55 mojo_shell_connection->GetIdentity());
56 } 56 }
57 #endif 57 #endif // defined(USE_AURA) && defined(MOJO_SHELL_CLIENT)
58 ChromeBrowserMainExtraParts::PreProfileInit();
58 } 59 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h ('k') | mash/browser/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698