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

Side by Side Diff: mash/wm/window_manager.cc

Issue 1656123002: Moves accelerator registration to WindowManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mandoline Created 4 years, 10 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 | « mash/wm/window_manager.h ('k') | mash/wm/window_manager_application.h » ('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 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 "mash/wm/window_manager.h" 5 #include "mash/wm/window_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "components/mus/common/types.h" 10 #include "components/mus/common/types.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 name == mus::mojom::WindowManager::kPreferredSize_Property || 149 name == mus::mojom::WindowManager::kPreferredSize_Property ||
150 name == mus::mojom::WindowManager::kResizeBehavior_Property || 150 name == mus::mojom::WindowManager::kResizeBehavior_Property ||
151 name == mus::mojom::WindowManager::kWindowTitle_Property; 151 name == mus::mojom::WindowManager::kWindowTitle_Property;
152 } 152 }
153 153
154 mus::Window* WindowManager::OnWmCreateTopLevelWindow( 154 mus::Window* WindowManager::OnWmCreateTopLevelWindow(
155 std::map<std::string, std::vector<uint8_t>>* properties) { 155 std::map<std::string, std::vector<uint8_t>>* properties) {
156 return NewTopLevelWindow(properties); 156 return NewTopLevelWindow(properties);
157 } 157 }
158 158
159 void WindowManager::OnAccelerator(uint32_t id, mus::mojom::EventPtr event) {
160 root_controller_->OnAccelerator(id, std::move(event));
161 }
162
159 } // namespace wm 163 } // namespace wm
160 } // namespace mash 164 } // namespace mash
OLDNEW
« no previous file with comments | « mash/wm/window_manager.h ('k') | mash/wm/window_manager_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698