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

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

Issue 2057793002: Reorganize event mojom files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed typos in comments. 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
« no previous file with comments | « ash/mus/accelerator_registrar_unittest.cc ('k') | ash/mus/window_manager.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 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/root_window_controller.h" 5 #include "ash/mus/root_window_controller.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <map> 9 #include <map>
10 #include <sstream> 10 #include <sstream>
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 RootWindowController::RootWindowController(WindowManagerApplication* app) 154 RootWindowController::RootWindowController(WindowManagerApplication* app)
155 : app_(app), root_(nullptr), window_count_(0) { 155 : app_(app), root_(nullptr), window_count_(0) {
156 window_manager_.reset(new WindowManager); 156 window_manager_.reset(new WindowManager);
157 } 157 }
158 158
159 RootWindowController::~RootWindowController() {} 159 RootWindowController::~RootWindowController() {}
160 160
161 void RootWindowController::AddAccelerators() { 161 void RootWindowController::AddAccelerators() {
162 window_manager_client()->AddAccelerator( 162 window_manager_client()->AddAccelerator(
163 kWindowSwitchAccelerator, 163 kWindowSwitchAccelerator,
164 ::mus::CreateKeyMatcher(::mus::mojom::KeyboardCode::TAB, 164 ::mus::CreateKeyMatcher(ui::mojom::KeyboardCode::TAB,
165 ::mus::mojom::kEventFlagControlDown), 165 ui::mojom::kEventFlagControlDown),
166 base::Bind(&AssertTrue)); 166 base::Bind(&AssertTrue));
167 } 167 }
168 168
169 void RootWindowController::OnEmbed(::mus::Window* root) { 169 void RootWindowController::OnEmbed(::mus::Window* root) {
170 root_ = root; 170 root_ = root;
171 root_->AddObserver(this); 171 root_->AddObserver(this);
172 172
173 app_->OnRootWindowControllerGotRoot(this); 173 app_->OnRootWindowControllerGotRoot(this);
174 174
175 wm_root_window_controller_.reset( 175 wm_root_window_controller_.reset(
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 base::WrapUnique(new DockedWindowLayoutManager(docked_container))); 274 base::WrapUnique(new DockedWindowLayoutManager(docked_container)));
275 275
276 WmWindowMus* panel_container = 276 WmWindowMus* panel_container =
277 GetWindowByShellWindowId(kShellWindowId_PanelContainer); 277 GetWindowByShellWindowId(kShellWindowId_PanelContainer);
278 panel_container->SetLayoutManager( 278 panel_container->SetLayoutManager(
279 base::WrapUnique(new PanelLayoutManager(panel_container))); 279 base::WrapUnique(new PanelLayoutManager(panel_container)));
280 } 280 }
281 281
282 } // namespace mus 282 } // namespace mus
283 } // namespace ash 283 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/accelerator_registrar_unittest.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698