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

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

Issue 10837112: Add WebContents* to some more WebContentsDelegate methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 4 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 | Annotate | Revision Log
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_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "content/browser/renderer_host/dip_util.h" 8 #include "content/browser/renderer_host/dip_util.h"
9 #include "content/browser/renderer_host/render_view_host_factory.h" 9 #include "content/browser/renderer_host/render_view_host_factory.h"
10 #include "content/browser/web_contents/interstitial_page_impl.h" 10 #include "content/browser/web_contents/interstitial_page_impl.h"
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 current_drag_op_ = operation; 463 current_drag_op_ = operation;
464 } 464 }
465 465
466 void WebContentsViewAura::GotFocus() { 466 void WebContentsViewAura::GotFocus() {
467 if (web_contents_->GetDelegate()) 467 if (web_contents_->GetDelegate())
468 web_contents_->GetDelegate()->WebContentsFocused(web_contents_); 468 web_contents_->GetDelegate()->WebContentsFocused(web_contents_);
469 } 469 }
470 470
471 void WebContentsViewAura::TakeFocus(bool reverse) { 471 void WebContentsViewAura::TakeFocus(bool reverse) {
472 if (web_contents_->GetDelegate() && 472 if (web_contents_->GetDelegate() &&
473 !web_contents_->GetDelegate()->TakeFocus(reverse) && 473 !web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse) &&
474 delegate_.get()) { 474 delegate_.get()) {
475 delegate_->TakeFocus(reverse); 475 delegate_->TakeFocus(reverse);
476 } 476 }
477 } 477 }
478 478
479 //////////////////////////////////////////////////////////////////////////////// 479 ////////////////////////////////////////////////////////////////////////////////
480 // WebContentsViewAura, aura::WindowDelegate implementation: 480 // WebContentsViewAura, aura::WindowDelegate implementation:
481 481
482 gfx::Size WebContentsViewAura::GetMinimumSize() const { 482 gfx::Size WebContentsViewAura::GetMinimumSize() const {
483 return gfx::Size(); 483 return gfx::Size();
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 OnDragEntered(event); 633 OnDragEntered(event);
634 634
635 web_contents_->GetRenderViewHost()->DragTargetDrop( 635 web_contents_->GetRenderViewHost()->DragTargetDrop(
636 event.location(), 636 event.location(),
637 gfx::Screen::GetCursorScreenPoint(), 637 gfx::Screen::GetCursorScreenPoint(),
638 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 638 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
639 if (drag_dest_delegate_) 639 if (drag_dest_delegate_)
640 drag_dest_delegate_->OnDrop(); 640 drag_dest_delegate_->OnDrop();
641 return current_drag_op_; 641 return current_drag_op_;
642 } 642 }
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_android.cc ('k') | content/browser/web_contents/web_contents_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698