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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2323063003: mash: Port sysui's WallpaperDelegateMus to mojo:ash. (Closed)
Patch Set: Alternative display info workaround. 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
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/mus/bridge/wm_shell_mus.h" 5 #include "ash/mus/bridge/wm_shell_mus.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/keyboard/keyboard_ui.h" 10 #include "ash/common/keyboard/keyboard_ui.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 CreateMaximizeModeController(); 134 CreateMaximizeModeController();
135 135
136 CreateMruWindowTracker(); 136 CreateMruWindowTracker();
137 137
138 SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate)); 138 SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
139 139
140 // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here. 140 // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here.
141 SetKeyboardUI(KeyboardUI::Create()); 141 SetKeyboardUI(KeyboardUI::Create());
142 142
143 // TODO(msw): Port WallpaperDelegateMus and support this (crbug.com/629605): 143 wallpaper_delegate()->InitializeWallpaper();
144 // wallpaper_delegate()->InitializeWallpaper();
145 } 144 }
146 145
147 WmShellMus::~WmShellMus() { 146 WmShellMus::~WmShellMus() {
148 // This order mirrors that of Shell. 147 // This order mirrors that of Shell.
149 148
150 // Destroy maximize mode controller early on since it has some observers which 149 // Destroy maximize mode controller early on since it has some observers which
151 // need to be removed. 150 // need to be removed.
152 DeleteMaximizeModeController(); 151 DeleteMaximizeModeController();
153 DeleteToastManager(); 152 DeleteToastManager();
154 DeleteSystemTrayDelegate(); 153 DeleteSystemTrayDelegate();
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 OnWindowActivated(gained_active, lost_active)); 436 OnWindowActivated(gained_active, lost_active));
438 } 437 }
439 438
440 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 439 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
441 DCHECK_EQ(window_tree_client(), client); 440 DCHECK_EQ(window_tree_client(), client);
442 client->RemoveObserver(this); 441 client->RemoveObserver(this);
443 } 442 }
444 443
445 } // namespace mus 444 } // namespace mus
446 } // namespace ash 445 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698