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

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

Issue 964403003: Make it possible to set the display mode from Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Decouple getting display mode and renderer-initiated fullscreen mode code paths Created 5 years, 8 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 <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1504 1504
1505 FOR_EACH_OBSERVER(WebContentsObserver, 1505 FOR_EACH_OBSERVER(WebContentsObserver,
1506 observers_, 1506 observers_,
1507 DidToggleFullscreenModeForTab(IsFullscreenForCurrentTab())); 1507 DidToggleFullscreenModeForTab(IsFullscreenForCurrentTab()));
1508 } 1508 }
1509 1509
1510 bool WebContentsImpl::IsFullscreenForCurrentTab() const { 1510 bool WebContentsImpl::IsFullscreenForCurrentTab() const {
1511 return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false; 1511 return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false;
1512 } 1512 }
1513 1513
1514 blink::WebDisplayMode WebContentsImpl::GetDisplayMode() const {
1515 return delegate_ ? delegate_->GetDisplayMode(this)
1516 : blink::WebDisplayModeBrowser;
1517 }
1518
1514 void WebContentsImpl::RequestToLockMouse(bool user_gesture, 1519 void WebContentsImpl::RequestToLockMouse(bool user_gesture,
1515 bool last_unlocked_by_target) { 1520 bool last_unlocked_by_target) {
1516 if (delegate_) { 1521 if (delegate_) {
1517 delegate_->RequestToLockMouse(this, user_gesture, last_unlocked_by_target); 1522 delegate_->RequestToLockMouse(this, user_gesture, last_unlocked_by_target);
1518 } else { 1523 } else {
1519 GotResponseToLockMouseRequest(false); 1524 GotResponseToLockMouseRequest(false);
1520 } 1525 }
1521 } 1526 }
1522 1527
1523 void WebContentsImpl::LostMouseLock() { 1528 void WebContentsImpl::LostMouseLock() {
(...skipping 3062 matching lines...) Expand 10 before | Expand all | Expand 10 after
4586 node->render_manager()->ResumeResponseDeferredAtStart(); 4591 node->render_manager()->ResumeResponseDeferredAtStart();
4587 } 4592 }
4588 4593
4589 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4594 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4590 force_disable_overscroll_content_ = force_disable; 4595 force_disable_overscroll_content_ = force_disable;
4591 if (view_) 4596 if (view_)
4592 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4597 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4593 } 4598 }
4594 4599
4595 } // namespace content 4600 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698