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 <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 virtual void OnInputMethodChanged() OVERRIDE; | 253 virtual void OnInputMethodChanged() OVERRIDE; |
254 virtual bool ChangeTextDirectionAndLayoutAlignment( | 254 virtual bool ChangeTextDirectionAndLayoutAlignment( |
255 base::i18n::TextDirection direction) OVERRIDE; | 255 base::i18n::TextDirection direction) OVERRIDE; |
256 virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE; | 256 virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE; |
257 virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE; | 257 virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE; |
258 virtual void OnCandidateWindowShown() OVERRIDE; | 258 virtual void OnCandidateWindowShown() OVERRIDE; |
259 virtual void OnCandidateWindowUpdated() OVERRIDE; | 259 virtual void OnCandidateWindowUpdated() OVERRIDE; |
260 virtual void OnCandidateWindowHidden() OVERRIDE; | 260 virtual void OnCandidateWindowHidden() OVERRIDE; |
261 | 261 |
262 // Overridden from gfx::DisplayObserver: | 262 // Overridden from gfx::DisplayObserver: |
263 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; | |
264 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; | 263 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; |
265 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; | 264 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; |
| 265 virtual void OnDisplayMetricsChanged( |
| 266 const gfx::Display& display, |
| 267 DisplayObserver::DisplayMetrics metrics) OVERRIDE; |
266 | 268 |
267 // Overridden from aura::WindowDelegate: | 269 // Overridden from aura::WindowDelegate: |
268 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 270 virtual gfx::Size GetMinimumSize() const OVERRIDE; |
269 virtual gfx::Size GetMaximumSize() const OVERRIDE; | 271 virtual gfx::Size GetMaximumSize() const OVERRIDE; |
270 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 272 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
271 const gfx::Rect& new_bounds) OVERRIDE; | 273 const gfx::Rect& new_bounds) OVERRIDE; |
272 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; | 274 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
273 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; | 275 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
274 virtual bool ShouldDescendIntoChildForEventHandling( | 276 virtual bool ShouldDescendIntoChildForEventHandling( |
275 aura::Window* child, | 277 aura::Window* child, |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
563 // etc. | 565 // etc. |
564 scoped_ptr<content::LegacyRenderWidgetHostHWND> | 566 scoped_ptr<content::LegacyRenderWidgetHostHWND> |
565 legacy_render_widget_host_HWND_; | 567 legacy_render_widget_host_HWND_; |
566 #endif | 568 #endif |
567 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 569 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
568 }; | 570 }; |
569 | 571 |
570 } // namespace content | 572 } // namespace content |
571 | 573 |
572 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 574 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
OLD | NEW |