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

Side by Side Diff: mojo/views/native_widget_view_manager.h

Issue 541013002: Fix the buttons in the mojo demo window manager debug panel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | mojo/views/native_widget_view_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_ 5 #ifndef MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_
6 #define MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_ 6 #define MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_
7 7
8 #include "mojo/aura/window_tree_host_mojo_delegate.h" 8 #include "mojo/aura/window_tree_host_mojo_delegate.h"
9 #include "mojo/services/public/cpp/view_manager/view_observer.h" 9 #include "mojo/services/public/cpp/view_manager/view_observer.h"
10 #include "ui/views/widget/native_widget_aura.h" 10 #include "ui/views/widget/native_widget_aura.h"
11 11
12 namespace aura {
13 namespace client {
14 class DefaultCaptureClient;
15 }
16 }
17
12 namespace ui { 18 namespace ui {
13 namespace internal { 19 namespace internal {
14 class InputMethodDelegate; 20 class InputMethodDelegate;
15 } 21 }
16 } 22 }
17 23
18 namespace wm { 24 namespace wm {
19 class FocusController; 25 class FocusController;
20 class ScopedCaptureClient;
21 } 26 }
22 27
23 namespace mojo { 28 namespace mojo {
24 29
25 class WindowTreeHostMojo; 30 class WindowTreeHostMojo;
26 31
27 class NativeWidgetViewManager : public views::NativeWidgetAura, 32 class NativeWidgetViewManager : public views::NativeWidgetAura,
28 public WindowTreeHostMojoDelegate, 33 public WindowTreeHostMojoDelegate,
29 public ViewObserver { 34 public ViewObserver {
30 public: 35 public:
(...skipping 17 matching lines...) Expand all
48 virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE; 53 virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE;
49 54
50 scoped_ptr<WindowTreeHostMojo> window_tree_host_; 55 scoped_ptr<WindowTreeHostMojo> window_tree_host_;
51 56
52 scoped_ptr<wm::FocusController> focus_client_; 57 scoped_ptr<wm::FocusController> focus_client_;
53 58
54 scoped_ptr<ui::internal::InputMethodDelegate> ime_filter_; 59 scoped_ptr<ui::internal::InputMethodDelegate> ime_filter_;
55 60
56 View* view_; 61 View* view_;
57 62
58 scoped_ptr<wm::ScopedCaptureClient> capture_client_; 63 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
59 64
60 DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager); 65 DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager);
61 }; 66 };
62 67
63 } // namespace mojo 68 } // namespace mojo
64 69
65 #endif // MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_ 70 #endif // MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | mojo/views/native_widget_view_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698