| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 OverscrollMode new_mode) OVERRIDE; | 145 OverscrollMode new_mode) OVERRIDE; |
| 146 | 146 |
| 147 // Overridden from ui::ImplicitAnimationObserver: | 147 // Overridden from ui::ImplicitAnimationObserver: |
| 148 virtual void OnImplicitAnimationsCompleted() OVERRIDE; | 148 virtual void OnImplicitAnimationsCompleted() OVERRIDE; |
| 149 | 149 |
| 150 // Overridden from aura::WindowDelegate: | 150 // Overridden from aura::WindowDelegate: |
| 151 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 151 virtual gfx::Size GetMinimumSize() const OVERRIDE; |
| 152 virtual gfx::Size GetMaximumSize() const OVERRIDE; | 152 virtual gfx::Size GetMaximumSize() const OVERRIDE; |
| 153 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 153 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 154 const gfx::Rect& new_bounds) OVERRIDE; | 154 const gfx::Rect& new_bounds) OVERRIDE; |
| 155 virtual void OnPropertyChanged(const void* key, intptr_t old) OVERRIDE; |
| 155 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; | 156 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
| 156 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; | 157 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
| 157 virtual bool ShouldDescendIntoChildForEventHandling( | 158 virtual bool ShouldDescendIntoChildForEventHandling( |
| 158 aura::Window* child, | 159 aura::Window* child, |
| 159 const gfx::Point& location) OVERRIDE; | 160 const gfx::Point& location) OVERRIDE; |
| 160 virtual bool CanFocus() OVERRIDE; | 161 virtual bool CanFocus() OVERRIDE; |
| 161 virtual void OnCaptureLost() OVERRIDE; | 162 virtual void OnCaptureLost() OVERRIDE; |
| 162 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; | 163 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
| 163 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; | 164 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; |
| 164 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; | 165 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 // On Windows we can run into problems if resources get released within the | 233 // On Windows we can run into problems if resources get released within the |
| 233 // initialization phase while the content (and its dimensions) are not known. | 234 // initialization phase while the content (and its dimensions) are not known. |
| 234 bool is_or_was_visible_; | 235 bool is_or_was_visible_; |
| 235 | 236 |
| 236 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 237 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 237 }; | 238 }; |
| 238 | 239 |
| 239 } // namespace content | 240 } // namespace content |
| 240 | 241 |
| 241 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 242 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |