| 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 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| (...skipping 1566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1577 // WebContentsViewAura since changes to the Window's bounds need to be | 1577 // WebContentsViewAura since changes to the Window's bounds need to be |
| 1578 // messaged to the renderer. WebContentsViewAura invokes SetSize() or | 1578 // messaged to the renderer. WebContentsViewAura invokes SetSize() or |
| 1579 // SetBounds() itself. No matter how we got here, any redundant calls are | 1579 // SetBounds() itself. No matter how we got here, any redundant calls are |
| 1580 // harmless. | 1580 // harmless. |
| 1581 SetSize(new_bounds.size()); | 1581 SetSize(new_bounds.size()); |
| 1582 | 1582 |
| 1583 if (GetInputMethod()) | 1583 if (GetInputMethod()) |
| 1584 GetInputMethod()->OnCaretBoundsChanged(this); | 1584 GetInputMethod()->OnCaretBoundsChanged(this); |
| 1585 } | 1585 } |
| 1586 | 1586 |
| 1587 void RenderWidgetHostViewAura::OnPropertyChanged(const void* key, |
| 1588 intptr_t old) { |
| 1589 } |
| 1590 |
| 1587 gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) { | 1591 gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) { |
| 1588 if (mouse_locked_) | 1592 if (mouse_locked_) |
| 1589 return ui::kCursorNone; | 1593 return ui::kCursorNone; |
| 1590 return current_cursor_.GetNativeCursor(); | 1594 return current_cursor_.GetNativeCursor(); |
| 1591 } | 1595 } |
| 1592 | 1596 |
| 1593 int RenderWidgetHostViewAura::GetNonClientComponent( | 1597 int RenderWidgetHostViewAura::GetNonClientComponent( |
| 1594 const gfx::Point& point) const { | 1598 const gfx::Point& point) const { |
| 1595 return HTCLIENT; | 1599 return HTCLIENT; |
| 1596 } | 1600 } |
| (...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2493 | 2497 |
| 2494 //////////////////////////////////////////////////////////////////////////////// | 2498 //////////////////////////////////////////////////////////////////////////////// |
| 2495 // RenderWidgetHostViewBase, public: | 2499 // RenderWidgetHostViewBase, public: |
| 2496 | 2500 |
| 2497 // static | 2501 // static |
| 2498 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2502 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2499 GetScreenInfoForWindow(results, NULL); | 2503 GetScreenInfoForWindow(results, NULL); |
| 2500 } | 2504 } |
| 2501 | 2505 |
| 2502 } // namespace content | 2506 } // namespace content |
| OLD | NEW |