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

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

Issue 468193005: Remove SetAllowOverlappingView from RWHVMac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_ca_flag
Patch Set: Created 6 years, 4 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
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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 void WebContentsViewGuest::SetInitialFocus() { 113 void WebContentsViewGuest::SetInitialFocus() {
114 platform_view_->SetInitialFocus(); 114 platform_view_->SetInitialFocus();
115 } 115 }
116 116
117 gfx::Rect WebContentsViewGuest::GetViewBounds() const { 117 gfx::Rect WebContentsViewGuest::GetViewBounds() const {
118 return gfx::Rect(size_); 118 return gfx::Rect(size_);
119 } 119 }
120 120
121 #if defined(OS_MACOSX) 121 #if defined(OS_MACOSX)
122 void WebContentsViewGuest::SetAllowOverlappingViews(bool overlapping) {
123 platform_view_->SetAllowOverlappingViews(overlapping);
124 }
125
126 bool WebContentsViewGuest::GetAllowOverlappingViews() const {
127 return platform_view_->GetAllowOverlappingViews();
128 }
129
130 void WebContentsViewGuest::SetAllowOtherViews(bool allow) { 122 void WebContentsViewGuest::SetAllowOtherViews(bool allow) {
131 platform_view_->SetAllowOtherViews(allow); 123 platform_view_->SetAllowOtherViews(allow);
132 } 124 }
133 125
134 bool WebContentsViewGuest::GetAllowOtherViews() const { 126 bool WebContentsViewGuest::GetAllowOtherViews() const {
135 return platform_view_->GetAllowOtherViews(); 127 return platform_view_->GetAllowOtherViews();
136 } 128 }
137 #endif 129 #endif
138 130
139 void WebContentsViewGuest::CreateView(const gfx::Size& initial_size, 131 void WebContentsViewGuest::CreateView(const gfx::Size& initial_size,
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 embedder_render_view_host->GetDelegate()->GetDelegateView(); 247 embedder_render_view_host->GetDelegate()->GetDelegateView();
256 if (view) { 248 if (view) {
257 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.StartDrag")); 249 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.StartDrag"));
258 view->StartDragging(drop_data, ops, image, image_offset, event_info); 250 view->StartDragging(drop_data, ops, image, image_offset, event_info);
259 } else { 251 } else {
260 embedder_web_contents->SystemDragEnded(); 252 embedder_web_contents->SystemDragEnded();
261 } 253 }
262 } 254 }
263 255
264 } // namespace content 256 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_guest.h ('k') | content/browser/web_contents/web_contents_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698