| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_RENDERER_RENDER_VIEW_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_H_ |
| 6 #define CONTENT_RENDERER_RENDER_VIEW_H_ | 6 #define CONTENT_RENDERER_RENDER_VIEW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <deque> | 9 #include <deque> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 610 virtual void OnSetFocus(bool enable); | 610 virtual void OnSetFocus(bool enable); |
| 611 virtual void OnWasHidden(); | 611 virtual void OnWasHidden(); |
| 612 virtual void OnWasRestored(bool needs_repainting); | 612 virtual void OnWasRestored(bool needs_repainting); |
| 613 virtual bool SupportsAsynchronousSwapBuffers() OVERRIDE; | 613 virtual bool SupportsAsynchronousSwapBuffers() OVERRIDE; |
| 614 virtual void OnImeSetComposition( | 614 virtual void OnImeSetComposition( |
| 615 const string16& text, | 615 const string16& text, |
| 616 const std::vector<WebKit::WebCompositionUnderline>& underlines, | 616 const std::vector<WebKit::WebCompositionUnderline>& underlines, |
| 617 int selection_start, | 617 int selection_start, |
| 618 int selection_end) OVERRIDE; | 618 int selection_end) OVERRIDE; |
| 619 virtual void OnImeConfirmComposition(const string16& text) OVERRIDE; | 619 virtual void OnImeConfirmComposition(const string16& text) OVERRIDE; |
| 620 virtual WebKit::WebTextInputType GetTextInputType() OVERRIDE; | 620 virtual ui::TextInputType GetTextInputType() OVERRIDE; |
| 621 virtual bool CanComposeInline() OVERRIDE; |
| 621 | 622 |
| 622 private: | 623 private: |
| 623 // For unit tests. | 624 // For unit tests. |
| 624 friend class ExternalPopupMenuTest; | 625 friend class ExternalPopupMenuTest; |
| 625 friend class PepperDeviceTest; | 626 friend class PepperDeviceTest; |
| 626 friend class RenderViewTest; | 627 friend class RenderViewTest; |
| 627 | 628 |
| 628 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); | 629 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); |
| 629 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); | 630 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); |
| 630 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); | 631 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1159 // bunch of stuff, you should probably create a helper class and put your | 1160 // bunch of stuff, you should probably create a helper class and put your |
| 1160 // data and methods on that to avoid bloating RenderView more. You can use | 1161 // data and methods on that to avoid bloating RenderView more. You can use |
| 1161 // the Observer interface to filter IPC messages and receive frame change | 1162 // the Observer interface to filter IPC messages and receive frame change |
| 1162 // notifications. | 1163 // notifications. |
| 1163 // --------------------------------------------------------------------------- | 1164 // --------------------------------------------------------------------------- |
| 1164 | 1165 |
| 1165 DISALLOW_COPY_AND_ASSIGN(RenderView); | 1166 DISALLOW_COPY_AND_ASSIGN(RenderView); |
| 1166 }; | 1167 }; |
| 1167 | 1168 |
| 1168 #endif // CONTENT_RENDERER_RENDER_VIEW_H_ | 1169 #endif // CONTENT_RENDERER_RENDER_VIEW_H_ |
| OLD | NEW |