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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase 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
11 #if defined(USE_AURA) 11 #if defined(USE_AURA)
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "content/public/common/service_manager_connection.h" 14 #include "content/public/common/service_manager_connection.h"
15 #include "services/shell/public/cpp/connector.h" 15 #include "services/service_manager/public/cpp/connector.h"
16 #include "services/shell/runner/common/client_util.h" 16 #include "services/service_manager/runner/common/client_util.h"
17 #include "services/ui/public/cpp/gpu_service.h" 17 #include "services/ui/public/cpp/gpu_service.h"
18 #include "services/ui/public/cpp/input_devices/input_device_client.h" 18 #include "services/ui/public/cpp/input_devices/input_device_client.h"
19 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom. h" 19 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom. h"
20 #include "ui/display/screen.h" 20 #include "ui/display/screen.h"
21 #include "ui/views/mus/window_manager_connection.h" 21 #include "ui/views/mus/window_manager_connection.h"
22 #include "ui/views/widget/desktop_aura/desktop_screen.h" 22 #include "ui/views/widget/desktop_aura/desktop_screen.h"
23 #include "ui/wm/core/wm_state.h" 23 #include "ui/wm/core/wm_state.h"
24 #endif // defined(USE_AURA) 24 #endif // defined(USE_AURA)
25 25
26 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { 26 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
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