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

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

Issue 1153813003: Add user_gesture param to WebContentsDelegate::ActivateContents Base URL: https://chromium.googlesource.com/chromium/src.git@ug1_WebContentsImpl_Activate
Patch Set: Update callers 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 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after
1321 set.insert(GetRenderWidgetHostView()); 1321 set.insert(GetRenderWidgetHostView());
1322 } else { 1322 } else {
1323 ForEachFrame( 1323 ForEachFrame(
1324 base::Bind(&AddRenderWidgetHostViewToSet, base::Unretained(&set))); 1324 base::Bind(&AddRenderWidgetHostViewToSet, base::Unretained(&set)));
1325 } 1325 }
1326 return set; 1326 return set;
1327 } 1327 }
1328 1328
1329 void WebContentsImpl::Activate(bool user_gesture) { 1329 void WebContentsImpl::Activate(bool user_gesture) {
1330 if (delegate_) 1330 if (delegate_)
1331 delegate_->ActivateContents(this); 1331 delegate_->ActivateContents(this, user_gesture);
1332 } 1332 }
1333 1333
1334 void WebContentsImpl::Deactivate() { 1334 void WebContentsImpl::Deactivate() {
1335 if (delegate_) 1335 if (delegate_)
1336 delegate_->DeactivateContents(this); 1336 delegate_->DeactivateContents(this);
1337 } 1337 }
1338 1338
1339 void WebContentsImpl::LostCapture() { 1339 void WebContentsImpl::LostCapture() {
1340 if (delegate_) 1340 if (delegate_)
1341 delegate_->LostCapture(); 1341 delegate_->LostCapture();
(...skipping 3048 matching lines...) Expand 10 before | Expand all | Expand 10 after
4390 player_map->erase(it); 4390 player_map->erase(it);
4391 } 4391 }
4392 4392
4393 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4393 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4394 force_disable_overscroll_content_ = force_disable; 4394 force_disable_overscroll_content_ = force_disable;
4395 if (view_) 4395 if (view_)
4396 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4396 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4397 } 4397 }
4398 4398
4399 } // namespace content 4399 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/plugin_browsertest.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698