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

Side by Side Diff: ash/mus/window_manager_application.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, 3 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 | « no previous file | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ash/mus/window_manager_application.h" 5 #include "ash/mus/window_manager_application.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/material_design/material_design_controller.h" 9 #include "ash/common/material_design/material_design_controller.h"
10 #include "ash/mus/accelerators/accelerator_registrar_impl.h" 10 #include "ash/mus/accelerators/accelerator_registrar_impl.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 88
89 void WindowManagerApplication::InitWindowManager( 89 void WindowManagerApplication::InitWindowManager(
90 ui::WindowTreeClient* window_tree_client) { 90 ui::WindowTreeClient* window_tree_client) {
91 InitializeComponents(); 91 InitializeComponents();
92 92
93 window_manager_->Init(window_tree_client); 93 window_manager_->Init(window_tree_client);
94 } 94 }
95 95
96 void WindowManagerApplication::OnStart(const shell::Identity& identity) { 96 void WindowManagerApplication::OnStart(const shell::Identity& identity) {
97 aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak")); 97 aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak"));
98 gpu_service_ = ui::GpuService::Initialize(connector()); 98 gpu_service_ = ui::GpuService::Create(connector());
99 compositor_context_factory_.reset( 99 compositor_context_factory_.reset(
100 new views::SurfaceContextFactory(gpu_service_.get())); 100 new views::SurfaceContextFactory(gpu_service_.get()));
101 aura::Env::GetInstance()->set_context_factory( 101 aura::Env::GetInstance()->set_context_factory(
102 compositor_context_factory_.get()); 102 compositor_context_factory_.get());
103 window_manager_.reset(new WindowManager(connector())); 103 window_manager_.reset(new WindowManager(connector()));
104 104
105 MaterialDesignController::Initialize(); 105 MaterialDesignController::Initialize();
106 106
107 tracing_.Initialize(connector(), identity.name()); 107 tracing_.Initialize(connector(), identity.name());
108 108
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed, 142 base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
143 base::Unretained(this)))); 143 base::Unretained(this))));
144 } 144 }
145 145
146 void WindowManagerApplication::ScreenlockStateChanged(bool locked) { 146 void WindowManagerApplication::ScreenlockStateChanged(bool locked) {
147 window_manager_->SetScreenLocked(locked); 147 window_manager_->SetScreenLocked(locked);
148 } 148 }
149 149
150 } // namespace mus 150 } // namespace mus
151 } // namespace ash 151 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698