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

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

Issue 1824183002: Mash: Show app icons in shelf based on the Widget's app icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review comments 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
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_USER_WINDOW_CONTROLLER_IMPL_H_ 5 #ifndef MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_
6 #define MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_ 6 #define MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "components/mus/common/types.h" 11 #include "components/mus/common/types.h"
12 #include "components/mus/public/cpp/window_observer.h" 12 #include "components/mus/public/cpp/window_observer.h"
13 #include "components/mus/public/cpp/window_tree_connection_observer.h" 13 #include "components/mus/public/cpp/window_tree_connection_observer.h"
14 #include "mash/wm/public/interfaces/user_window_controller.mojom.h" 14 #include "mash/wm/public/interfaces/user_window_controller.mojom.h"
15 15
16 namespace mash { 16 namespace mash {
17 namespace wm { 17 namespace wm {
18 18
19 class RootWindowController; 19 class RootWindowController;
20 class WindowTitleObserver; 20 class WindowPropertyObserver;
21 21
22 class UserWindowControllerImpl : public mojom::UserWindowController, 22 class UserWindowControllerImpl : public mojom::UserWindowController,
23 public mus::WindowObserver, 23 public mus::WindowObserver,
24 public mus::WindowTreeConnectionObserver { 24 public mus::WindowTreeConnectionObserver {
25 public: 25 public:
26 UserWindowControllerImpl(); 26 UserWindowControllerImpl();
27 ~UserWindowControllerImpl() override; 27 ~UserWindowControllerImpl() override;
28 28
29 mojom::UserWindowObserver* user_window_observer() const { 29 mojom::UserWindowObserver* user_window_observer() const {
30 return user_window_observer_.get(); 30 return user_window_observer_.get();
(...skipping 11 matching lines...) Expand all
42 // mus::WindowTreeConnectionObserver: 42 // mus::WindowTreeConnectionObserver:
43 void OnWindowTreeFocusChanged(mus::Window* gained_focus, 43 void OnWindowTreeFocusChanged(mus::Window* gained_focus,
44 mus::Window* lost_focus) override; 44 mus::Window* lost_focus) override;
45 45
46 // mojom::UserWindowController: 46 // mojom::UserWindowController:
47 void AddUserWindowObserver(mojom::UserWindowObserverPtr observer) override; 47 void AddUserWindowObserver(mojom::UserWindowObserverPtr observer) override;
48 void FocusUserWindow(uint32_t window_id) override; 48 void FocusUserWindow(uint32_t window_id) override;
49 49
50 RootWindowController* root_controller_; 50 RootWindowController* root_controller_;
51 mojom::UserWindowObserverPtr user_window_observer_; 51 mojom::UserWindowObserverPtr user_window_observer_;
52 scoped_ptr<WindowTitleObserver> window_title_observer_; 52 scoped_ptr<WindowPropertyObserver> window_property_observer_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(UserWindowControllerImpl); 54 DISALLOW_COPY_AND_ASSIGN(UserWindowControllerImpl);
55 }; 55 };
56 56
57 } // namespace wm 57 } // namespace wm
58 } // namespace mash 58 } // namespace mash
59 59
60 #endif // MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_ 60 #endif // MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_
OLDNEW
« no previous file with comments | « mash/wm/public/interfaces/user_window_controller.mojom ('k') | mash/wm/user_window_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698