Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/node_observer.h" | 9 #include "mojo/services/public/cpp/view_manager/node_observer.h" |
| 10 #include "mojo/services/public/cpp/view_manager/view_observer.h" | 10 #include "mojo/services/public/cpp/view_manager/view_observer.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 45 // view_manager::NodeObserver: | 45 // view_manager::NodeObserver: |
| 46 virtual void OnNodeDestroyed(view_manager::Node* node) OVERRIDE; | 46 virtual void OnNodeDestroyed(view_manager::Node* node) OVERRIDE; |
| 47 virtual void OnNodeActiveViewChanged(view_manager::Node* node, | 47 virtual void OnNodeActiveViewChanged(view_manager::Node* node, |
| 48 view_manager::View* old_view, | 48 view_manager::View* old_view, |
| 49 view_manager::View* new_view) OVERRIDE; | 49 view_manager::View* new_view) OVERRIDE; |
| 50 | 50 |
| 51 // view_manager::ViewObserver | 51 // view_manager::ViewObserver |
| 52 virtual void OnViewInputEvent(view_manager::View* view, | 52 virtual void OnViewInputEvent(view_manager::View* view, |
| 53 const EventPtr& event) OVERRIDE; | 53 const EventPtr& event) OVERRIDE; |
| 54 | 54 |
| 55 // view_manager::NodeObserver | |
| 56 virtual void OnNodeBoundsChanged(view_manager::Node* node, | |
|
sky
2014/07/14 19:15:28
Move this with other NodeObserver overrides above.
hansmuller
2014/07/14 22:16:43
Done.
| |
| 57 const gfx::Rect& old_bounds, | |
| 58 const gfx::Rect& new_bounds) OVERRIDE; | |
| 59 | |
| 55 scoped_ptr<WindowTreeHostMojo> window_tree_host_; | 60 scoped_ptr<WindowTreeHostMojo> window_tree_host_; |
| 56 | 61 |
| 57 scoped_ptr<wm::FocusController> focus_client_; | 62 scoped_ptr<wm::FocusController> focus_client_; |
| 58 | 63 |
| 59 scoped_ptr<ui::internal::InputMethodDelegate> ime_filter_; | 64 scoped_ptr<ui::internal::InputMethodDelegate> ime_filter_; |
| 60 | 65 |
| 61 view_manager::Node* node_; | 66 view_manager::Node* node_; |
| 62 | 67 |
| 63 scoped_ptr<wm::ScopedCaptureClient> capture_client_; | 68 scoped_ptr<wm::ScopedCaptureClient> capture_client_; |
| 64 | 69 |
| 65 DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager); | 70 DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager); |
| 66 }; | 71 }; |
| 67 | 72 |
| 68 } // namespace mojo | 73 } // namespace mojo |
| 69 | 74 |
| 70 #endif // MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_ | 75 #endif // MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_ |
| OLD | NEW |