| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ | 5 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ |
| 6 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ | 6 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/memory/scoped_vector.h" | 9 #include "base/memory/scoped_vector.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 virtual void FocusNativeView(gfx::NativeView native_view) OVERRIDE; | 117 virtual void FocusNativeView(gfx::NativeView native_view) OVERRIDE; |
| 118 virtual bool ConvertPointFromAncestor( | 118 virtual bool ConvertPointFromAncestor( |
| 119 const Widget* ancestor, gfx::Point* point) const OVERRIDE; | 119 const Widget* ancestor, gfx::Point* point) const OVERRIDE; |
| 120 virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE; | 120 virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE; |
| 121 virtual void SetInactiveRenderingDisabled(bool value) OVERRIDE; | 121 virtual void SetInactiveRenderingDisabled(bool value) OVERRIDE; |
| 122 | 122 |
| 123 // Overridden from views::InputMethodDelegate: | 123 // Overridden from views::InputMethodDelegate: |
| 124 virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE; | 124 virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE; |
| 125 | 125 |
| 126 // Overridden from aura::WindowDelegate: | 126 // Overridden from aura::WindowDelegate: |
| 127 virtual void OnBoundsChanging(gfx::Rect* new_bounds) OVERRIDE; |
| 127 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 128 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 128 const gfx::Rect& new_bounds) OVERRIDE; | 129 const gfx::Rect& new_bounds) OVERRIDE; |
| 129 virtual void OnFocus() OVERRIDE; | 130 virtual void OnFocus() OVERRIDE; |
| 130 virtual void OnBlur() OVERRIDE; | 131 virtual void OnBlur() OVERRIDE; |
| 131 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; | 132 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; |
| 132 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; | 133 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
| 133 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; | 134 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
| 134 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; | 135 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; |
| 135 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; | 136 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; |
| 136 virtual bool ShouldActivate(aura::Event* event) OVERRIDE; | 137 virtual bool ShouldActivate(aura::Event* event) OVERRIDE; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 scoped_ptr<DesktopObserverImpl> desktop_observer_; | 174 scoped_ptr<DesktopObserverImpl> desktop_observer_; |
| 174 | 175 |
| 175 scoped_ptr<DropHelper> drop_helper_; | 176 scoped_ptr<DropHelper> drop_helper_; |
| 176 | 177 |
| 177 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); | 178 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); |
| 178 }; | 179 }; |
| 179 | 180 |
| 180 } // namespace views | 181 } // namespace views |
| 181 | 182 |
| 182 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ | 183 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ |
| OLD | NEW |