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

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

Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove compiler_specific.h inclusions Created 6 years, 2 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 | « mojo/views/input_method_mojo_linux.h ('k') | 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"
(...skipping 22 matching lines...) Expand all
33 public WindowTreeHostMojoDelegate, 33 public WindowTreeHostMojoDelegate,
34 public ViewObserver { 34 public ViewObserver {
35 public: 35 public:
36 NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate, 36 NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate,
37 View* view); 37 View* view);
38 virtual ~NativeWidgetViewManager(); 38 virtual ~NativeWidgetViewManager();
39 39
40 private: 40 private:
41 // Overridden from internal::NativeWidgetAura: 41 // Overridden from internal::NativeWidgetAura:
42 virtual void InitNativeWidget( 42 virtual void InitNativeWidget(
43 const views::Widget::InitParams& in_params) OVERRIDE; 43 const views::Widget::InitParams& in_params) override;
44 44
45 // WindowTreeHostMojoDelegate: 45 // WindowTreeHostMojoDelegate:
46 virtual void CompositorContentsChanged(const SkBitmap& bitmap) OVERRIDE; 46 virtual void CompositorContentsChanged(const SkBitmap& bitmap) override;
47 47
48 // ViewObserver: 48 // ViewObserver:
49 virtual void OnViewDestroyed(View* view) OVERRIDE; 49 virtual void OnViewDestroyed(View* view) override;
50 virtual void OnViewBoundsChanged(View* view, 50 virtual void OnViewBoundsChanged(View* view,
51 const gfx::Rect& old_bounds, 51 const gfx::Rect& old_bounds,
52 const gfx::Rect& new_bounds) OVERRIDE; 52 const gfx::Rect& new_bounds) override;
53 virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE; 53 virtual void OnViewInputEvent(View* view, const EventPtr& event) override;
54 54
55 scoped_ptr<WindowTreeHostMojo> window_tree_host_; 55 scoped_ptr<WindowTreeHostMojo> window_tree_host_;
56 56
57 scoped_ptr<wm::FocusController> focus_client_; 57 scoped_ptr<wm::FocusController> focus_client_;
58 58
59 scoped_ptr<ui::internal::InputMethodDelegate> ime_filter_; 59 scoped_ptr<ui::internal::InputMethodDelegate> ime_filter_;
60 60
61 View* view_; 61 View* view_;
62 62
63 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 63 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager); 65 DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager);
66 }; 66 };
67 67
68 } // namespace mojo 68 } // namespace mojo
69 69
70 #endif // MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_ 70 #endif // MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_
OLDNEW
« no previous file with comments | « mojo/views/input_method_mojo_linux.h ('k') | mojo/views/native_widget_view_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698