Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1023)

Side by Side Diff: content/browser/web_contents/web_contents_view_guest.cc

Issue 388803003: [Mac] Replace SetOverlayView with AllowOtherViews. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_guest.h" 5 #include "content/browser/web_contents/web_contents_view_guest.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "content/browser/browser_plugin/browser_plugin_embedder.h" 8 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
9 #include "content/browser/browser_plugin/browser_plugin_guest.h" 9 #include "content/browser/browser_plugin/browser_plugin_guest.h"
10 #include "content/browser/frame_host/interstitial_page_impl.h" 10 #include "content/browser/frame_host/interstitial_page_impl.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 120
121 #if defined(OS_MACOSX) 121 #if defined(OS_MACOSX)
122 void WebContentsViewGuest::SetAllowOverlappingViews(bool overlapping) { 122 void WebContentsViewGuest::SetAllowOverlappingViews(bool overlapping) {
123 platform_view_->SetAllowOverlappingViews(overlapping); 123 platform_view_->SetAllowOverlappingViews(overlapping);
124 } 124 }
125 125
126 bool WebContentsViewGuest::GetAllowOverlappingViews() const { 126 bool WebContentsViewGuest::GetAllowOverlappingViews() const {
127 return platform_view_->GetAllowOverlappingViews(); 127 return platform_view_->GetAllowOverlappingViews();
128 } 128 }
129 129
130 void WebContentsViewGuest::SetOverlayView( 130 void WebContentsViewGuest::SetAllowOtherViews(bool allow) {
131 WebContentsView* overlay, const gfx::Point& offset) { 131 platform_view_->SetAllowOtherViews(allow);
132 platform_view_->SetOverlayView(overlay, offset);
133 } 132 }
134 133
135 void WebContentsViewGuest::RemoveOverlayView() { 134 bool WebContentsViewGuest::GetAllowOtherViews() const {
136 platform_view_->RemoveOverlayView(); 135 return platform_view_->GetAllowOtherViews();
137 } 136 }
138 #endif 137 #endif
139 138
140 void WebContentsViewGuest::CreateView(const gfx::Size& initial_size, 139 void WebContentsViewGuest::CreateView(const gfx::Size& initial_size,
141 gfx::NativeView context) { 140 gfx::NativeView context) {
142 platform_view_->CreateView(initial_size, context); 141 platform_view_->CreateView(initial_size, context);
143 size_ = initial_size; 142 size_ = initial_size;
144 } 143 }
145 144
146 RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget( 145 RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 embedder_render_view_host->GetDelegate()->GetDelegateView(); 255 embedder_render_view_host->GetDelegate()->GetDelegateView();
257 if (view) { 256 if (view) {
258 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.StartDrag")); 257 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.StartDrag"));
259 view->StartDragging(drop_data, ops, image, image_offset, event_info); 258 view->StartDragging(drop_data, ops, image, image_offset, event_info);
260 } else { 259 } else {
261 embedder_web_contents->SystemDragEnded(); 260 embedder_web_contents->SystemDragEnded();
262 } 261 }
263 } 262 }
264 263
265 } // namespace content 264 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698