| 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/gtest_prod_util.h" | 10 #include "base/gtest_prod_util.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 bool OnOverscrollUpdate(float delta_x, float delta_y) override; | 122 bool OnOverscrollUpdate(float delta_x, float delta_y) override; |
| 123 void OnOverscrollComplete(OverscrollMode overscroll_mode) override; | 123 void OnOverscrollComplete(OverscrollMode overscroll_mode) override; |
| 124 void OnOverscrollModeChange(OverscrollMode old_mode, | 124 void OnOverscrollModeChange(OverscrollMode old_mode, |
| 125 OverscrollMode new_mode) override; | 125 OverscrollMode new_mode) override; |
| 126 | 126 |
| 127 // Overridden from aura::WindowDelegate: | 127 // Overridden from aura::WindowDelegate: |
| 128 gfx::Size GetMinimumSize() const override; | 128 gfx::Size GetMinimumSize() const override; |
| 129 gfx::Size GetMaximumSize() const override; | 129 gfx::Size GetMaximumSize() const override; |
| 130 void OnBoundsChanged(const gfx::Rect& old_bounds, | 130 void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 131 const gfx::Rect& new_bounds) override; | 131 const gfx::Rect& new_bounds) override; |
| 132 ui::TextInputClient* GetFocusedTextInputClient() override; | |
| 133 gfx::NativeCursor GetCursor(const gfx::Point& point) override; | 132 gfx::NativeCursor GetCursor(const gfx::Point& point) override; |
| 134 int GetNonClientComponent(const gfx::Point& point) const override; | 133 int GetNonClientComponent(const gfx::Point& point) const override; |
| 135 bool ShouldDescendIntoChildForEventHandling( | 134 bool ShouldDescendIntoChildForEventHandling( |
| 136 aura::Window* child, | 135 aura::Window* child, |
| 137 const gfx::Point& location) override; | 136 const gfx::Point& location) override; |
| 138 bool CanFocus() override; | 137 bool CanFocus() override; |
| 139 void OnCaptureLost() override; | 138 void OnCaptureLost() override; |
| 140 void OnPaint(const ui::PaintContext& context) override; | 139 void OnPaint(const ui::PaintContext& context) override; |
| 141 void OnDeviceScaleFactorChanged(float device_scale_factor) override; | 140 void OnDeviceScaleFactorChanged(float device_scale_factor) override; |
| 142 void OnWindowDestroying(aura::Window* window) override; | 141 void OnWindowDestroying(aura::Window* window) override; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 // On Windows we can run into problems if resources get released within the | 200 // On Windows we can run into problems if resources get released within the |
| 202 // initialization phase while the content (and its dimensions) are not known. | 201 // initialization phase while the content (and its dimensions) are not known. |
| 203 bool is_or_was_visible_; | 202 bool is_or_was_visible_; |
| 204 | 203 |
| 205 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 204 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 206 }; | 205 }; |
| 207 | 206 |
| 208 } // namespace content | 207 } // namespace content |
| 209 | 208 |
| 210 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 209 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |