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/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
844 } | 844 } |
845 | 845 |
846 if (!enabled) { | 846 if (!enabled) { |
847 navigation_overlay_.reset(); | 847 navigation_overlay_.reset(); |
848 } else if (!navigation_overlay_) { | 848 } else if (!navigation_overlay_) { |
849 navigation_overlay_.reset( | 849 navigation_overlay_.reset( |
850 new OverscrollNavigationOverlay(web_contents_, window_.get())); | 850 new OverscrollNavigationOverlay(web_contents_, window_.get())); |
851 } | 851 } |
852 } | 852 } |
853 | 853 |
| 854 ui::Compositor* WebContentsViewAura::GetCompositor() const { |
| 855 return window_ ? window_->GetHost()->compositor() : nullptr; |
| 856 } |
| 857 |
854 //////////////////////////////////////////////////////////////////////////////// | 858 //////////////////////////////////////////////////////////////////////////////// |
855 // WebContentsViewAura, RenderViewHostDelegateView implementation: | 859 // WebContentsViewAura, RenderViewHostDelegateView implementation: |
856 | 860 |
857 void WebContentsViewAura::ShowContextMenu(RenderFrameHost* render_frame_host, | 861 void WebContentsViewAura::ShowContextMenu(RenderFrameHost* render_frame_host, |
858 const ContextMenuParams& params) { | 862 const ContextMenuParams& params) { |
859 TouchSelectionControllerClientAura* selection_controller_client = | 863 TouchSelectionControllerClientAura* selection_controller_client = |
860 GetSelectionControllerClient(); | 864 GetSelectionControllerClient(); |
861 if (selection_controller_client && | 865 if (selection_controller_client && |
862 selection_controller_client->HandleContextMenu(params)) { | 866 selection_controller_client->HandleContextMenu(params)) { |
863 return; | 867 return; |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1218 bool allow_multiple_selection) { | 1222 bool allow_multiple_selection) { |
1219 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; | 1223 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; |
1220 } | 1224 } |
1221 | 1225 |
1222 void WebContentsViewAura::HidePopupMenu() { | 1226 void WebContentsViewAura::HidePopupMenu() { |
1223 NOTIMPLEMENTED(); | 1227 NOTIMPLEMENTED(); |
1224 } | 1228 } |
1225 #endif | 1229 #endif |
1226 | 1230 |
1227 } // namespace content | 1231 } // namespace content |
OLD | NEW |