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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 652673002: NOT FOR REVIEW: Modify ToggleFullscreenMode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fixPowerBlockerNonMedia
Patch Set: Rebase Created 6 years, 2 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
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2055 matching lines...) Expand 10 before | Expand all | Expand 10 after
2066 // timers so that we do not need to manage the shared timer in such a heavy 2066 // timers so that we do not need to manage the shared timer in such a heavy
2067 // handed manner. 2067 // handed manner.
2068 // 2068 //
2069 if (RenderThreadImpl::current()) // Will be NULL during unit tests. 2069 if (RenderThreadImpl::current()) // Will be NULL during unit tests.
2070 RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer(); 2070 RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer();
2071 2071
2072 SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal( 2072 SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(
2073 routing_id_, opener_id_)); 2073 routing_id_, opener_id_));
2074 } 2074 }
2075 2075
2076 bool RenderViewImpl::enterFullScreen() { 2076 bool RenderViewImpl::enterFullScreen(bool is_video) {
2077 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, true)); 2077 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, true, is_video));
2078 return true; 2078 return true;
2079 } 2079 }
2080 2080
2081 void RenderViewImpl::exitFullScreen() { 2081 void RenderViewImpl::exitFullScreen(bool is_video) {
2082 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, false)); 2082 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, false, is_video));
2083 } 2083 }
2084 2084
2085 bool RenderViewImpl::requestPointerLock() { 2085 bool RenderViewImpl::requestPointerLock() {
2086 return mouse_lock_dispatcher_->LockMouse(webwidget_mouse_lock_target_.get()); 2086 return mouse_lock_dispatcher_->LockMouse(webwidget_mouse_lock_target_.get());
2087 } 2087 }
2088 2088
2089 void RenderViewImpl::requestPointerUnlock() { 2089 void RenderViewImpl::requestPointerUnlock() {
2090 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get()); 2090 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get());
2091 } 2091 }
2092 2092
(...skipping 2092 matching lines...) Expand 10 before | Expand all | Expand 10 after
4185 std::vector<gfx::Size> sizes; 4185 std::vector<gfx::Size> sizes;
4186 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4186 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4187 if (!url.isEmpty()) 4187 if (!url.isEmpty())
4188 urls.push_back( 4188 urls.push_back(
4189 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4189 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4190 } 4190 }
4191 SendUpdateFaviconURL(urls); 4191 SendUpdateFaviconURL(urls);
4192 } 4192 }
4193 4193
4194 } // namespace content 4194 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698