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

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

Issue 2431753002: Mus experiment in content shell on Android.
Patch Set: Fix mac bot Created 4 years, 1 month 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 | « no previous file | content/public/app/BUILD.gn » ('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
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/service_manager/public/cpp/connector.h" 15 #include "services/service_manager/public/cpp/connector.h"
16 #include "services/service_manager/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" // nogncheck
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 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 26 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
27 #include "base/command_line.h" 27 #include "base/command_line.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 connection->GetConnector()->ConnectToInterface("service:ui", &server); 104 connection->GetConnector()->ConnectToInterface("service:ui", &server);
105 input_device_client_->Connect(std::move(server)); 105 input_device_client_->Connect(std::move(server));
106 106
107 window_manager_connection_ = views::WindowManagerConnection::Create( 107 window_manager_connection_ = views::WindowManagerConnection::Create(
108 connection->GetConnector(), connection->GetIdentity(), 108 connection->GetConnector(), connection->GetIdentity(),
109 content::BrowserThread::GetTaskRunnerForThread( 109 content::BrowserThread::GetTaskRunnerForThread(
110 content::BrowserThread::IO)); 110 content::BrowserThread::IO));
111 } 111 }
112 #endif // defined(USE_AURA) 112 #endif // defined(USE_AURA)
113 } 113 }
OLDNEW
« no previous file with comments | « no previous file | content/public/app/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698