| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/frame_host/interstitial_page_impl.h" | 5 #include "content/browser/frame_host/interstitial_page_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 using blink::WebDragOperationsMask; | 54 using blink::WebDragOperationsMask; |
| 55 | 55 |
| 56 namespace content { | 56 namespace content { |
| 57 | 57 |
| 58 class InterstitialPageImpl::InterstitialPageRVHDelegateView | 58 class InterstitialPageImpl::InterstitialPageRVHDelegateView |
| 59 : public RenderViewHostDelegateView { | 59 : public RenderViewHostDelegateView { |
| 60 public: | 60 public: |
| 61 explicit InterstitialPageRVHDelegateView(InterstitialPageImpl* page); | 61 explicit InterstitialPageRVHDelegateView(InterstitialPageImpl* page); |
| 62 | 62 |
| 63 // RenderViewHostDelegateView implementation: | 63 // RenderViewHostDelegateView implementation: |
| 64 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 64 #if defined(USE_EXTERNAL_POPUP_MENU) |
| 65 void ShowPopupMenu(RenderFrameHost* render_frame_host, | 65 void ShowPopupMenu(RenderFrameHost* render_frame_host, |
| 66 const gfx::Rect& bounds, | 66 const gfx::Rect& bounds, |
| 67 int item_height, | 67 int item_height, |
| 68 double item_font_size, | 68 double item_font_size, |
| 69 int selected_item, | 69 int selected_item, |
| 70 const std::vector<MenuItem>& items, | 70 const std::vector<MenuItem>& items, |
| 71 bool right_aligned, | 71 bool right_aligned, |
| 72 bool allow_multiple_selection) override; | 72 bool allow_multiple_selection) override; |
| 73 void HidePopupMenu() override; | 73 void HidePopupMenu() override; |
| 74 #endif | 74 #endif |
| (...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 862 return; | 862 return; |
| 863 delegate_->CommandReceived(json_string); | 863 delegate_->CommandReceived(json_string); |
| 864 } | 864 } |
| 865 | 865 |
| 866 | 866 |
| 867 InterstitialPageImpl::InterstitialPageRVHDelegateView:: | 867 InterstitialPageImpl::InterstitialPageRVHDelegateView:: |
| 868 InterstitialPageRVHDelegateView(InterstitialPageImpl* page) | 868 InterstitialPageRVHDelegateView(InterstitialPageImpl* page) |
| 869 : interstitial_page_(page) { | 869 : interstitial_page_(page) { |
| 870 } | 870 } |
| 871 | 871 |
| 872 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 872 #if defined(USE_EXTERNAL_POPUP_MENU) |
| 873 void InterstitialPageImpl::InterstitialPageRVHDelegateView::ShowPopupMenu( | 873 void InterstitialPageImpl::InterstitialPageRVHDelegateView::ShowPopupMenu( |
| 874 RenderFrameHost* render_frame_host, | 874 RenderFrameHost* render_frame_host, |
| 875 const gfx::Rect& bounds, | 875 const gfx::Rect& bounds, |
| 876 int item_height, | 876 int item_height, |
| 877 double item_font_size, | 877 double item_font_size, |
| 878 int selected_item, | 878 int selected_item, |
| 879 const std::vector<MenuItem>& items, | 879 const std::vector<MenuItem>& items, |
| 880 bool right_aligned, | 880 bool right_aligned, |
| 881 bool allow_multiple_selection) { | 881 bool allow_multiple_selection) { |
| 882 NOTREACHED() << "InterstitialPage does not support showing popup menus."; | 882 NOTREACHED() << "InterstitialPage does not support showing popup menus."; |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 934 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( | 934 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( |
| 935 const LoadCommittedDetails& load_details) { | 935 const LoadCommittedDetails& load_details) { |
| 936 interstitial_->OnNavigatingAwayOrTabClosing(); | 936 interstitial_->OnNavigatingAwayOrTabClosing(); |
| 937 } | 937 } |
| 938 | 938 |
| 939 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { | 939 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { |
| 940 interstitial_->OnNavigatingAwayOrTabClosing(); | 940 interstitial_->OnNavigatingAwayOrTabClosing(); |
| 941 } | 941 } |
| 942 | 942 |
| 943 } // namespace content | 943 } // namespace content |
| OLD | NEW |