| 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_VIEW_HOST_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 int callback_id); | 590 int callback_id); |
| 591 void OnShowDesktopNotification( | 591 void OnShowDesktopNotification( |
| 592 const ShowDesktopNotificationHostMsgParams& params); | 592 const ShowDesktopNotificationHostMsgParams& params); |
| 593 void OnCancelDesktopNotification(int notification_id); | 593 void OnCancelDesktopNotification(int notification_id); |
| 594 void OnRunFileChooser(const FileChooserParams& params); | 594 void OnRunFileChooser(const FileChooserParams& params); |
| 595 void OnDidAccessInitialDocument(); | 595 void OnDidAccessInitialDocument(); |
| 596 void OnFocusedNodeTouched(bool editable); | 596 void OnFocusedNodeTouched(bool editable); |
| 597 | 597 |
| 598 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 598 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
| 599 void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params); | 599 void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params); |
| 600 void OnHidePopup(); |
| 600 #endif | 601 #endif |
| 601 | 602 |
| 602 private: | 603 private: |
| 603 // TODO(nasko): Temporarily friend RenderFrameHostImpl, so we don't duplicate | 604 // TODO(nasko): Temporarily friend RenderFrameHostImpl, so we don't duplicate |
| 604 // utility functions and state needed in both classes, while we move frame | 605 // utility functions and state needed in both classes, while we move frame |
| 605 // specific code away from this class. | 606 // specific code away from this class. |
| 606 friend class RenderFrameHostImpl; | 607 friend class RenderFrameHostImpl; |
| 607 friend class TestRenderViewHost; | 608 friend class TestRenderViewHost; |
| 608 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, BasicRenderFrameHost); | 609 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, BasicRenderFrameHost); |
| 609 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, RoutingIdSane); | 610 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, RoutingIdSane); |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); | 732 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); |
| 732 }; | 733 }; |
| 733 | 734 |
| 734 #if defined(COMPILER_MSVC) | 735 #if defined(COMPILER_MSVC) |
| 735 #pragma warning(pop) | 736 #pragma warning(pop) |
| 736 #endif | 737 #endif |
| 737 | 738 |
| 738 } // namespace content | 739 } // namespace content |
| 739 | 740 |
| 740 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 741 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| OLD | NEW |