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

Side by Side Diff: ash/sysui/sysui_application.cc

Issue 2055273004: Remove unused variables, ash/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/sysui/sysui_application.h" 5 #include "ash/sysui/sysui_application.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 aura::Window* root() { return Shell::GetPrimaryRootWindow(); } 213 aura::Window* root() { return Shell::GetPrimaryRootWindow(); }
214 214
215 void Initialize(::shell::Connector* connector, 215 void Initialize(::shell::Connector* connector,
216 const ::shell::Identity& identity) { 216 const ::shell::Identity& identity) {
217 InitializeResourceBundle(connector); 217 InitializeResourceBundle(connector);
218 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); 218 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
219 MaterialDesignController::Initialize(); 219 MaterialDesignController::Initialize();
220 window_manager_connection_ = 220 window_manager_connection_ =
221 views::WindowManagerConnection::Create(connector, identity); 221 views::WindowManagerConnection::Create(connector, identity);
222 222
223 display::Screen* screen = display::Screen::GetScreen();
224 DCHECK(screen);
225 gfx::Size size = screen->GetPrimaryDisplay().bounds().size();
226
227 // Uninstall the ScreenMus installed by WindowManagerConnection, so that ash 223 // Uninstall the ScreenMus installed by WindowManagerConnection, so that ash
228 // installs and uses the ScreenAsh. This can be removed once ash learns to 224 // installs and uses the ScreenAsh. This can be removed once ash learns to
229 // talk to mus for managing displays. 225 // talk to mus for managing displays.
230 // TODO(mfomitchev): We need to fix this. http://crbug.com/607300 226 // TODO(mfomitchev): We need to fix this. http://crbug.com/607300
231 display::Screen::SetScreenInstance(nullptr); 227 display::Screen::SetScreenInstance(nullptr);
232 228
233 // Install some hook so that the WindowTreeHostMus created for widgets can 229 // Install some hook so that the WindowTreeHostMus created for widgets can
234 // be hooked up correctly. 230 // be hooked up correctly.
235 native_widget_factory_.reset(new NativeWidgetFactory()); 231 native_widget_factory_.reset(new NativeWidgetFactory());
236 232
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 mojom::WallpaperControllerRequest request) { 331 mojom::WallpaperControllerRequest request) {
336 mojom::WallpaperController* wallpaper_controller = 332 mojom::WallpaperController* wallpaper_controller =
337 static_cast<UserWallpaperDelegateMus*>( 333 static_cast<UserWallpaperDelegateMus*>(
338 Shell::GetInstance()->user_wallpaper_delegate()); 334 Shell::GetInstance()->user_wallpaper_delegate());
339 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, 335 wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
340 std::move(request)); 336 std::move(request));
341 } 337 }
342 338
343 } // namespace sysui 339 } // namespace sysui
344 } // namespace ash 340 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc ('k') | ash/touch/touch_transformer_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698