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

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

Issue 1135693006: Fix X11DesktopHandler::ActivateWindow on Unity for known user gestures Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 <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 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1329 base::Bind(&AddRenderWidgetHostViewToSet, base::Unretained(&set))); 1329 base::Bind(&AddRenderWidgetHostViewToSet, base::Unretained(&set)));
1330 } 1330 }
1331 return set; 1331 return set;
1332 } 1332 }
1333 1333
1334 void WebContentsImpl::Activate() { 1334 void WebContentsImpl::Activate() {
1335 if (delegate_) 1335 if (delegate_)
1336 delegate_->ActivateContents(this); 1336 delegate_->ActivateContents(this);
1337 } 1337 }
1338 1338
1339 void WebContentsImpl::ActivateForUserGesture() {
1340 if (delegate_)
1341 delegate_->ActivateContentsForUserGesture(this);
1342 }
1343
1339 void WebContentsImpl::Deactivate() { 1344 void WebContentsImpl::Deactivate() {
1340 if (delegate_) 1345 if (delegate_)
1341 delegate_->DeactivateContents(this); 1346 delegate_->DeactivateContents(this);
1342 } 1347 }
1343 1348
1344 void WebContentsImpl::LostCapture() { 1349 void WebContentsImpl::LostCapture() {
1345 if (delegate_) 1350 if (delegate_)
1346 delegate_->LostCapture(); 1351 delegate_->LostCapture();
1347 } 1352 }
1348 1353
(...skipping 3082 matching lines...) Expand 10 before | Expand all | Expand 10 after
4431 node->render_manager()->ResumeResponseDeferredAtStart(); 4436 node->render_manager()->ResumeResponseDeferredAtStart();
4432 } 4437 }
4433 4438
4434 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4439 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4435 force_disable_overscroll_content_ = force_disable; 4440 force_disable_overscroll_content_ = force_disable;
4436 if (view_) 4441 if (view_)
4437 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4442 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4438 } 4443 }
4439 4444
4440 } // namespace content 4445 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698