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

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

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no-find-copies Created 4 years, 5 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/display/display_info.h" 9 #include "ash/common/display/display_info.h"
10 #include "ash/common/keyboard/keyboard_ui.h" 10 #include "ash/common/keyboard/keyboard_ui.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 } // namespace 97 } // namespace
98 98
99 WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate, 99 WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
100 ::ui::WindowTreeClient* client) 100 ::ui::WindowTreeClient* client)
101 : WmShell(std::move(shell_delegate)), 101 : WmShell(std::move(shell_delegate)),
102 client_(client), 102 client_(client),
103 session_state_delegate_(new SessionStateDelegateStub) { 103 session_state_delegate_(new SessionStateDelegateStub) {
104 client_->AddObserver(this); 104 client_->AddObserver(this);
105 WmShell::Set(this); 105 WmShell::Set(this);
106 106
107 SetAcceleratorController(base::MakeUnique<AcceleratorController>());
108
107 CreateMaximizeModeController(); 109 CreateMaximizeModeController();
108 110
109 CreateMruWindowTracker(); 111 CreateMruWindowTracker();
110 112
111 SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate)); 113 SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
112 114
113 // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here. 115 // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here.
114 SetKeyboardUI(KeyboardUI::Create()); 116 SetKeyboardUI(KeyboardUI::Create());
115 } 117 }
116 118
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 OnWindowActivated(gained_active, lost_active)); 351 OnWindowActivated(gained_active, lost_active));
350 } 352 }
351 353
352 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) { 354 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) {
353 DCHECK_EQ(client, client_); 355 DCHECK_EQ(client, client_);
354 RemoveClientObserver(); 356 RemoveClientObserver();
355 } 357 }
356 358
357 } // namespace mus 359 } // namespace mus
358 } // namespace ash 360 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698