| 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 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 int callback_id); | 585 int callback_id); |
| 586 void OnShowDesktopNotification( | 586 void OnShowDesktopNotification( |
| 587 const ShowDesktopNotificationHostMsgParams& params); | 587 const ShowDesktopNotificationHostMsgParams& params); |
| 588 void OnCancelDesktopNotification(int notification_id); | 588 void OnCancelDesktopNotification(int notification_id); |
| 589 void OnRunFileChooser(const FileChooserParams& params); | 589 void OnRunFileChooser(const FileChooserParams& params); |
| 590 void OnDidAccessInitialDocument(); | 590 void OnDidAccessInitialDocument(); |
| 591 void OnFocusedNodeTouched(bool editable); | 591 void OnFocusedNodeTouched(bool editable); |
| 592 | 592 |
| 593 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 593 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
| 594 void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params); | 594 void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params); |
| 595 void OnHidePopup(); |
| 595 #endif | 596 #endif |
| 596 | 597 |
| 597 private: | 598 private: |
| 598 // TODO(nasko): Temporarily friend RenderFrameHostImpl, so we don't duplicate | 599 // TODO(nasko): Temporarily friend RenderFrameHostImpl, so we don't duplicate |
| 599 // utility functions and state needed in both classes, while we move frame | 600 // utility functions and state needed in both classes, while we move frame |
| 600 // specific code away from this class. | 601 // specific code away from this class. |
| 601 friend class RenderFrameHostImpl; | 602 friend class RenderFrameHostImpl; |
| 602 friend class TestRenderViewHost; | 603 friend class TestRenderViewHost; |
| 603 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, BasicRenderFrameHost); | 604 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, BasicRenderFrameHost); |
| 604 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, RoutingIdSane); | 605 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, RoutingIdSane); |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); | 721 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); |
| 721 }; | 722 }; |
| 722 | 723 |
| 723 #if defined(COMPILER_MSVC) | 724 #if defined(COMPILER_MSVC) |
| 724 #pragma warning(pop) | 725 #pragma warning(pop) |
| 725 #endif | 726 #endif |
| 726 | 727 |
| 727 } // namespace content | 728 } // namespace content |
| 728 | 729 |
| 729 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 730 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| OLD | NEW |