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

Side by Side Diff: ash/mus/window_manager_application.cc

Issue 2471033005: Adds DesktopWindowTreeHostMus (Closed)
Patch Set: fix 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
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/common/mojo_interface_factory.h" 10 #include "ash/common/mojo_interface_factory.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 network_connect_delegate_.reset(); 111 network_connect_delegate_.reset();
112 chromeos::NetworkHandler::Shutdown(); 112 chromeos::NetworkHandler::Shutdown();
113 bluez::BluezDBusManager::Shutdown(); 113 bluez::BluezDBusManager::Shutdown();
114 chromeos::DBusThreadManager::Shutdown(); 114 chromeos::DBusThreadManager::Shutdown();
115 #endif 115 #endif
116 message_center::MessageCenter::Shutdown(); 116 message_center::MessageCenter::Shutdown();
117 } 117 }
118 118
119 void WindowManagerApplication::OnStart( 119 void WindowManagerApplication::OnStart(
120 const service_manager::ServiceInfo& info) { 120 const service_manager::ServiceInfo& info) {
121 aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak", 121 aura_init_ = base::MakeUnique<views::AuraInit>(connector(), info.identity,
122 "ash_mus_resources_200.pak")); 122 "ash_mus_resources.pak",
123 "ash_mus_resources_200.pak");
123 gpu_service_ = ui::GpuService::Create(connector()); 124 gpu_service_ = ui::GpuService::Create(connector());
124 compositor_context_factory_.reset( 125 compositor_context_factory_.reset(
125 new views::SurfaceContextFactory(gpu_service_.get())); 126 new views::SurfaceContextFactory(gpu_service_.get()));
126 aura::Env::GetInstance()->set_context_factory( 127 aura::Env::GetInstance()->set_context_factory(
127 compositor_context_factory_.get()); 128 compositor_context_factory_.get());
128 window_manager_.reset(new WindowManager(connector())); 129 window_manager_.reset(new WindowManager(connector()));
129 130
130 MaterialDesignController::Initialize(); 131 MaterialDesignController::Initialize();
131 132
132 tracing_.Initialize(connector(), info.identity.name()); 133 tracing_.Initialize(connector(), info.identity.name());
(...skipping 24 matching lines...) Expand all
157 } 158 }
158 return true; 159 return true;
159 } 160 }
160 161
161 void WindowManagerApplication::ScreenlockStateChanged(bool locked) { 162 void WindowManagerApplication::ScreenlockStateChanged(bool locked) {
162 window_manager_->SetScreenLocked(locked); 163 window_manager_->SetScreenLocked(locked);
163 } 164 }
164 165
165 } // namespace mus 166 } // namespace mus
166 } // namespace ash 167 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698