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

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

Issue 1814533002: Use ui::Event instead of mojom::EventPtr in mash/wm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_eventptr
Patch Set: Created 4 years, 9 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/root_window_controller.cc ('k') | mash/wm/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 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 #ifndef MASH_WM_WINDOW_MANAGER_H_ 5 #ifndef MASH_WM_WINDOW_MANAGER_H_
6 #define MASH_WM_WINDOW_MANAGER_H_ 6 #define MASH_WM_WINDOW_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 void OnWindowEmbeddedAppDisconnected(mus::Window* window) override; 46 void OnWindowEmbeddedAppDisconnected(mus::Window* window) override;
47 47
48 // WindowManagerDelegate: 48 // WindowManagerDelegate:
49 void SetWindowManagerClient(mus::WindowManagerClient* client) override; 49 void SetWindowManagerClient(mus::WindowManagerClient* client) override;
50 bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override; 50 bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override;
51 bool OnWmSetProperty(mus::Window* window, 51 bool OnWmSetProperty(mus::Window* window,
52 const std::string& name, 52 const std::string& name,
53 scoped_ptr<std::vector<uint8_t>>* new_data) override; 53 scoped_ptr<std::vector<uint8_t>>* new_data) override;
54 mus::Window* OnWmCreateTopLevelWindow( 54 mus::Window* OnWmCreateTopLevelWindow(
55 std::map<std::string, std::vector<uint8_t>>* properties) override; 55 std::map<std::string, std::vector<uint8_t>>* properties) override;
56 void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override; 56 void OnAccelerator(uint32_t id, const ui::Event& event) override;
57 57
58 // mash::shell::mojom::ScreenlockStateListener: 58 // mash::shell::mojom::ScreenlockStateListener:
59 void ScreenlockStateChanged(bool locked) override; 59 void ScreenlockStateChanged(bool locked) override;
60 60
61 RootWindowController* root_controller_; 61 RootWindowController* root_controller_;
62 mus::WindowManagerClient* window_manager_client_; 62 mus::WindowManagerClient* window_manager_client_;
63 63
64 mojo::Binding<mash::shell::mojom::ScreenlockStateListener> binding_; 64 mojo::Binding<mash::shell::mojom::ScreenlockStateListener> binding_;
65 65
66 DISALLOW_COPY_AND_ASSIGN(WindowManager); 66 DISALLOW_COPY_AND_ASSIGN(WindowManager);
67 }; 67 };
68 68
69 } // namespace wm 69 } // namespace wm
70 } // namespace mash 70 } // namespace mash
71 71
72 #endif // MASH_WM_WINDOW_MANAGER_H_ 72 #endif // MASH_WM_WINDOW_MANAGER_H_
OLDNEW
« no previous file with comments | « mash/wm/root_window_controller.cc ('k') | mash/wm/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698