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

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

Issue 2249413004: services/ui: Allow injecting the IO thread task runner for gpu channel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 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 | « ash/mus/window_manager_application.cc ('k') | content/renderer/render_thread_impl.cc » ('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/common/mojo_shell_connection.h" 14 #include "content/public/common/mojo_shell_connection.h"
14 #include "services/shell/public/cpp/connector.h" 15 #include "services/shell/public/cpp/connector.h"
15 #include "services/shell/runner/common/client_util.h" 16 #include "services/shell/runner/common/client_util.h"
17 #include "services/ui/public/cpp/gpu_service.h"
16 #include "services/ui/public/cpp/input_devices/input_device_client.h" 18 #include "services/ui/public/cpp/input_devices/input_device_client.h"
17 #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"
18 #include "ui/display/screen.h" 20 #include "ui/display/screen.h"
19 #include "ui/views/mus/window_manager_connection.h" 21 #include "ui/views/mus/window_manager_connection.h"
20 #include "ui/views/widget/desktop_aura/desktop_screen.h" 22 #include "ui/views/widget/desktop_aura/desktop_screen.h"
21 #include "ui/wm/core/wm_state.h" 23 #include "ui/wm/core/wm_state.h"
22 #endif // defined(USE_AURA) 24 #endif // defined(USE_AURA)
23 25
24 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { 26 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
25 } 27 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 base::RunLoop wait_loop; 59 base::RunLoop wait_loop;
58 connection->SetInitializeHandler(wait_loop.QuitClosure()); 60 connection->SetInitializeHandler(wait_loop.QuitClosure());
59 wait_loop.Run(); 61 wait_loop.Run();
60 62
61 input_device_client_.reset(new ui::InputDeviceClient()); 63 input_device_client_.reset(new ui::InputDeviceClient());
62 ui::mojom::InputDeviceServerPtr server; 64 ui::mojom::InputDeviceServerPtr server;
63 connection->GetConnector()->ConnectToInterface("mojo:ui", &server); 65 connection->GetConnector()->ConnectToInterface("mojo:ui", &server);
64 input_device_client_->Connect(std::move(server)); 66 input_device_client_->Connect(std::move(server));
65 67
66 window_manager_connection_ = views::WindowManagerConnection::Create( 68 window_manager_connection_ = views::WindowManagerConnection::Create(
67 connection->GetConnector(), connection->GetIdentity()); 69 connection->GetConnector(), connection->GetIdentity(),
70 content::BrowserThread::GetTaskRunnerForThread(
71 content::BrowserThread::IO));
68 } 72 }
69 #endif // defined(USE_AURA) 73 #endif // defined(USE_AURA)
70 } 74 }
OLDNEW
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698