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_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 base::i18n::TextDirection direction) OVERRIDE; | 163 base::i18n::TextDirection direction) OVERRIDE; |
164 virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE; | 164 virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE; |
165 | 165 |
166 // Overridden from gfx::DisplayObserver: | 166 // Overridden from gfx::DisplayObserver: |
167 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; | 167 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; |
168 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; | 168 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; |
169 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; | 169 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; |
170 | 170 |
171 // Overridden from aura::WindowDelegate: | 171 // Overridden from aura::WindowDelegate: |
172 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 172 virtual gfx::Size GetMinimumSize() const OVERRIDE; |
| 173 virtual gfx::Size GetMaximumSize() const OVERRIDE; |
173 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 174 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
174 const gfx::Rect& new_bounds) OVERRIDE; | 175 const gfx::Rect& new_bounds) OVERRIDE; |
175 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; | 176 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; |
176 virtual void OnBlur() OVERRIDE; | 177 virtual void OnBlur() OVERRIDE; |
177 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; | 178 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
178 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; | 179 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
179 virtual bool ShouldDescendIntoChildForEventHandling( | 180 virtual bool ShouldDescendIntoChildForEventHandling( |
180 aura::Window* child, | 181 aura::Window* child, |
181 const gfx::Point& location) OVERRIDE; | 182 const gfx::Point& location) OVERRIDE; |
182 virtual bool CanFocus() OVERRIDE; | 183 virtual bool CanFocus() OVERRIDE; |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 NO_PENDING_COMMIT, | 420 NO_PENDING_COMMIT, |
420 }; | 421 }; |
421 CanLockCompositorState can_lock_compositor_; | 422 CanLockCompositorState can_lock_compositor_; |
422 | 423 |
423 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 424 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
424 }; | 425 }; |
425 | 426 |
426 } // namespace content | 427 } // namespace content |
427 | 428 |
428 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 429 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
OLD | NEW |