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

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

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 // The screen may have already been set in test initialization. 48 // The screen may have already been set in test initialization.
49 if (!display::Screen::GetScreen()) 49 if (!display::Screen::GetScreen())
50 display::Screen::SetScreenInstance(views::CreateDesktopScreen()); 50 display::Screen::SetScreenInstance(views::CreateDesktopScreen());
51 #endif 51 #endif
52 } 52 }
53 53
54 void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted( 54 void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted(
55 content::ServiceManagerConnection* connection) { 55 content::ServiceManagerConnection* connection) {
56 DCHECK(connection); 56 DCHECK(connection);
57 #if defined(USE_AURA) 57 #if defined(USE_AURA)
58 if (shell::ShellIsRemote()) { 58 if (service_manager::ServiceManagerIsRemote()) {
59 // TODO(rockot): Remove the blocking wait for init. 59 // TODO(rockot): Remove the blocking wait for init.
60 // http://crbug.com/594852. 60 // http://crbug.com/594852.
61 base::RunLoop wait_loop; 61 base::RunLoop wait_loop;
62 connection->SetInitializeHandler(wait_loop.QuitClosure()); 62 connection->SetInitializeHandler(wait_loop.QuitClosure());
63 wait_loop.Run(); 63 wait_loop.Run();
64 64
65 input_device_client_.reset(new ui::InputDeviceClient()); 65 input_device_client_.reset(new ui::InputDeviceClient());
66 ui::mojom::InputDeviceServerPtr server; 66 ui::mojom::InputDeviceServerPtr server;
67 connection->GetConnector()->ConnectToInterface("service:ui", &server); 67 connection->GetConnector()->ConnectToInterface("service:ui", &server);
68 input_device_client_->Connect(std::move(server)); 68 input_device_client_->Connect(std::move(server));
69 69
70 window_manager_connection_ = views::WindowManagerConnection::Create( 70 window_manager_connection_ = views::WindowManagerConnection::Create(
71 connection->GetConnector(), connection->GetIdentity(), 71 connection->GetConnector(), connection->GetIdentity(),
72 content::BrowserThread::GetTaskRunnerForThread( 72 content::BrowserThread::GetTaskRunnerForThread(
73 content::BrowserThread::IO)); 73 content::BrowserThread::IO));
74 } 74 }
75 #endif // defined(USE_AURA) 75 #endif // defined(USE_AURA)
76 } 76 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698