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

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

Issue 1980633002: Remove unused routing ID param from Did(Show|Destroy)FullscreenWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 1662 matching lines...) Expand 10 before | Expand all | Expand 10 after
1673 1673
1674 if (is_being_destroyed_) 1674 if (is_being_destroyed_)
1675 return; 1675 return;
1676 1676
1677 if (render_widget_host && 1677 if (render_widget_host &&
1678 render_widget_host->GetRoutingID() == fullscreen_widget_routing_id_) { 1678 render_widget_host->GetRoutingID() == fullscreen_widget_routing_id_) {
1679 if (delegate_ && delegate_->EmbedsFullscreenWidget()) 1679 if (delegate_ && delegate_->EmbedsFullscreenWidget())
1680 delegate_->ExitFullscreenModeForTab(this); 1680 delegate_->ExitFullscreenModeForTab(this);
1681 FOR_EACH_OBSERVER(WebContentsObserver, 1681 FOR_EACH_OBSERVER(WebContentsObserver,
1682 observers_, 1682 observers_,
1683 DidDestroyFullscreenWidget( 1683 DidDestroyFullscreenWidget());
1684 fullscreen_widget_routing_id_));
1685 fullscreen_widget_routing_id_ = MSG_ROUTING_NONE; 1684 fullscreen_widget_routing_id_ = MSG_ROUTING_NONE;
1686 if (fullscreen_widget_had_focus_at_shutdown_) 1685 if (fullscreen_widget_had_focus_at_shutdown_)
1687 view_->RestoreFocus(); 1686 view_->RestoreFocus();
1688 } 1687 }
1689 } 1688 }
1690 1689
1691 void WebContentsImpl::RenderWidgetGotFocus( 1690 void WebContentsImpl::RenderWidgetGotFocus(
1692 RenderWidgetHostImpl* render_widget_host) { 1691 RenderWidgetHostImpl* render_widget_host) {
1693 // Notify the observers if an embedded fullscreen widget was focused. 1692 // Notify the observers if an embedded fullscreen widget was focused.
1694 if (delegate_ && render_widget_host && delegate_->EmbedsFullscreenWidget() && 1693 if (delegate_ && render_widget_host && delegate_->EmbedsFullscreenWidget() &&
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 view_->StoreFocus(); 2174 view_->StoreFocus();
2176 fullscreen_widget_routing_id_ = route_id; 2175 fullscreen_widget_routing_id_ = route_id;
2177 if (delegate_ && delegate_->EmbedsFullscreenWidget()) { 2176 if (delegate_ && delegate_->EmbedsFullscreenWidget()) {
2178 widget_host_view->InitAsChild(GetRenderWidgetHostView()->GetNativeView()); 2177 widget_host_view->InitAsChild(GetRenderWidgetHostView()->GetNativeView());
2179 delegate_->EnterFullscreenModeForTab(this, GURL()); 2178 delegate_->EnterFullscreenModeForTab(this, GURL());
2180 } else { 2179 } else {
2181 widget_host_view->InitAsFullscreen(view); 2180 widget_host_view->InitAsFullscreen(view);
2182 } 2181 }
2183 FOR_EACH_OBSERVER(WebContentsObserver, 2182 FOR_EACH_OBSERVER(WebContentsObserver,
2184 observers_, 2183 observers_,
2185 DidShowFullscreenWidget(route_id)); 2184 DidShowFullscreenWidget());
2186 if (!widget_host_view->HasFocus()) 2185 if (!widget_host_view->HasFocus())
2187 widget_host_view->Focus(); 2186 widget_host_view->Focus();
2188 } else { 2187 } else {
2189 widget_host_view->InitAsPopup(view, initial_rect); 2188 widget_host_view->InitAsPopup(view, initial_rect);
2190 } 2189 }
2191 2190
2192 RenderWidgetHostImpl* render_widget_host_impl = 2191 RenderWidgetHostImpl* render_widget_host_impl =
2193 RenderWidgetHostImpl::From(widget_host_view->GetRenderWidgetHost()); 2192 RenderWidgetHostImpl::From(widget_host_view->GetRenderWidgetHost());
2194 render_widget_host_impl->Init(); 2193 render_widget_host_impl->Init();
2195 // Only allow privileged mouse lock for fullscreen render widget, which is 2194 // Only allow privileged mouse lock for fullscreen render widget, which is
(...skipping 2836 matching lines...) Expand 10 before | Expand all | Expand 10 after
5032 for (RenderViewHost* render_view_host : render_view_host_set) 5031 for (RenderViewHost* render_view_host : render_view_host_set)
5033 render_view_host->OnWebkitPreferencesChanged(); 5032 render_view_host->OnWebkitPreferencesChanged();
5034 } 5033 }
5035 5034
5036 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5035 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5037 JavaScriptDialogManager* dialog_manager) { 5036 JavaScriptDialogManager* dialog_manager) {
5038 dialog_manager_ = dialog_manager; 5037 dialog_manager_ = dialog_manager;
5039 } 5038 }
5040 5039
5041 } // namespace content 5040 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/capture/web_contents_tracker.cc ('k') | content/public/browser/web_contents_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698