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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 10038026: TabContents -> WebContentsImpl, part 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« content/browser/web_contents/interstitial_page_impl.cc ('K') | « content/browser/web_contents/web_contents_view_aura.h ('k') | content/browser/web_contents/web_contents_view_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 811570c68d526ec127a300c8b48561987839dad4..6d492472796ef71ca7835863c548b7a0da661dc8 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -34,7 +34,7 @@ namespace {
// the renderer.
class WebDragSourceAura : public MessageLoopForUI::Observer {
public:
- explicit WebDragSourceAura(TabContents* contents)
+ explicit WebDragSourceAura(WebContentsImpl* contents)
: contents_(contents) {
MessageLoopForUI::current()->AddObserver(this);
}
@@ -71,7 +71,7 @@ class WebDragSourceAura : public MessageLoopForUI::Observer {
private:
- TabContents* contents_;
+ WebContentsImpl* contents_;
DISALLOW_COPY_AND_ASSIGN(WebDragSourceAura);
};
@@ -163,9 +163,9 @@ WebKit::WebDragOperationsMask ConvertToWeb(int drag_op) {
// WebContentsViewAura, public:
WebContentsViewAura::WebContentsViewAura(
- TabContents* tab_contents,
+ WebContentsImpl* web_contents,
content::WebContentsViewDelegate* delegate)
- : tab_contents_(tab_contents),
+ : web_contents_(web_contents),
view_(NULL),
delegate_(delegate),
current_drag_op_(WebKit::WebDragOperationNone),
@@ -179,10 +179,10 @@ WebContentsViewAura::~WebContentsViewAura() {
// WebContentsViewAura, private:
void WebContentsViewAura::SizeChangedCommon(const gfx::Size& size) {
- if (tab_contents_->GetInterstitialPage())
- tab_contents_->GetInterstitialPage()->SetSize(size);
+ if (web_contents_->GetInterstitialPage())
+ web_contents_->GetInterstitialPage()->SetSize(size);
content::RenderWidgetHostView* rwhv =
- tab_contents_->GetRenderWidgetHostView();
+ web_contents_->GetRenderWidgetHostView();
if (rwhv)
rwhv->SetSize(size);
}
@@ -191,7 +191,7 @@ void WebContentsViewAura::EndDrag(WebKit::WebDragOperationsMask ops) {
aura::RootWindow* root_window = GetNativeView()->GetRootWindow();
gfx::Point screen_loc = root_window->last_mouse_location();
gfx::Point client_loc = screen_loc;
- content::RenderViewHost* rvh = tab_contents_->GetRenderViewHost();
+ content::RenderViewHost* rvh = web_contents_->GetRenderViewHost();
aura::Window* window = rvh->GetView()->GetNativeView();
aura::Window::ConvertPointToWindow(root_window, window, &client_loc);
rvh->DragSourceEndedAt(client_loc.x(), client_loc.y(), screen_loc.x(),
@@ -283,8 +283,8 @@ void WebContentsViewAura::RenderViewCreated(content::RenderViewHost* host) {
}
void WebContentsViewAura::Focus() {
- if (tab_contents_->GetInterstitialPage()) {
- tab_contents_->GetInterstitialPage()->Focus();
+ if (web_contents_->GetInterstitialPage()) {
+ web_contents_->GetInterstitialPage()->Focus();
return;
}
@@ -292,14 +292,14 @@ void WebContentsViewAura::Focus() {
return;
content::RenderWidgetHostView* rwhv =
- tab_contents_->GetRenderWidgetHostView();
+ web_contents_->GetRenderWidgetHostView();
if (rwhv)
rwhv->Focus();
}
void WebContentsViewAura::SetInitialFocus() {
- if (tab_contents_->FocusLocationBarByDefault())
- tab_contents_->SetFocusToLocationBar(false);
+ if (web_contents_->FocusLocationBarByDefault())
+ web_contents_->SetFocusToLocationBar(false);
else
Focus();
}
@@ -350,19 +350,19 @@ void WebContentsViewAura::GetViewBounds(gfx::Rect* out) const {
void WebContentsViewAura::CreateNewWindow(
int route_id,
const ViewHostMsg_CreateWindow_Params& params) {
- web_contents_view_helper_.CreateNewWindow(tab_contents_, route_id, params);
+ web_contents_view_helper_.CreateNewWindow(web_contents_, route_id, params);
}
void WebContentsViewAura::CreateNewWidget(int route_id,
WebKit::WebPopupType popup_type) {
- web_contents_view_helper_.CreateNewWidget(tab_contents_,
+ web_contents_view_helper_.CreateNewWidget(web_contents_,
route_id,
false,
popup_type);
}
void WebContentsViewAura::CreateNewFullscreenWidget(int route_id) {
- web_contents_view_helper_.CreateNewWidget(tab_contents_,
+ web_contents_view_helper_.CreateNewWidget(web_contents_,
route_id,
true,
WebKit::WebPopupTypeNone);
@@ -373,19 +373,19 @@ void WebContentsViewAura::ShowCreatedWindow(int route_id,
const gfx::Rect& initial_pos,
bool user_gesture) {
web_contents_view_helper_.ShowCreatedWindow(
- tab_contents_, route_id, disposition, initial_pos, user_gesture);
+ web_contents_, route_id, disposition, initial_pos, user_gesture);
}
void WebContentsViewAura::ShowCreatedWidget(int route_id,
const gfx::Rect& initial_pos) {
- web_contents_view_helper_.ShowCreatedWidget(tab_contents_,
+ web_contents_view_helper_.ShowCreatedWidget(web_contents_,
route_id,
false,
initial_pos);
}
void WebContentsViewAura::ShowCreatedFullscreenWidget(int route_id) {
- web_contents_view_helper_.ShowCreatedWidget(tab_contents_,
+ web_contents_view_helper_.ShowCreatedWidget(web_contents_,
route_id,
true,
gfx::Rect());
@@ -394,8 +394,8 @@ void WebContentsViewAura::ShowCreatedFullscreenWidget(int route_id) {
void WebContentsViewAura::ShowContextMenu(
const content::ContextMenuParams& params) {
// Allow WebContentsDelegates to handle the context menu operation first.
- if (tab_contents_->GetDelegate() &&
- tab_contents_->GetDelegate()->HandleContextMenu(params)) {
+ if (web_contents_->GetDelegate() &&
+ web_contents_->GetDelegate()->HandleContextMenu(params)) {
return;
}
@@ -429,7 +429,7 @@ void WebContentsViewAura::StartDragging(
ui::OSExchangeData data(provider); // takes ownership of |provider|.
scoped_ptr<WebDragSourceAura> drag_source(
- new WebDragSourceAura(tab_contents_));
+ new WebDragSourceAura(web_contents_));
// We need to enable recursive tasks on the message loop so we can get
// updates while in the system DoDragDrop loop.
@@ -447,20 +447,20 @@ void WebContentsViewAura::StartDragging(
}
EndDrag(ConvertToWeb(result_op));
- tab_contents_->GetRenderViewHost()->DragSourceSystemDragEnded();}
+ web_contents_->GetRenderViewHost()->DragSourceSystemDragEnded();}
void WebContentsViewAura::UpdateDragCursor(WebKit::WebDragOperation operation) {
current_drag_op_ = operation;
}
void WebContentsViewAura::GotFocus() {
- if (tab_contents_->GetDelegate())
- tab_contents_->GetDelegate()->WebContentsFocused(tab_contents_);
+ if (web_contents_->GetDelegate())
+ web_contents_->GetDelegate()->WebContentsFocused(web_contents_);
}
void WebContentsViewAura::TakeFocus(bool reverse) {
- if (tab_contents_->GetDelegate() &&
- !tab_contents_->GetDelegate()->TakeFocus(reverse) &&
+ if (web_contents_->GetDelegate() &&
+ !web_contents_->GetDelegate()->TakeFocus(reverse) &&
delegate_.get()) {
delegate_->TakeFocus(reverse);
}
@@ -499,16 +499,16 @@ int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const {
}
bool WebContentsViewAura::OnMouseEvent(aura::MouseEvent* event) {
- if (!tab_contents_->GetDelegate())
+ if (!web_contents_->GetDelegate())
return false;
switch (event->type()) {
case ui::ET_MOUSE_PRESSED:
- tab_contents_->GetDelegate()->ActivateContents(tab_contents_);
+ web_contents_->GetDelegate()->ActivateContents(web_contents_);
break;
case ui::ET_MOUSE_MOVED:
- tab_contents_->GetDelegate()->ContentsMouseEvent(
- tab_contents_, gfx::Screen::GetCursorScreenPoint(), true);
+ web_contents_->GetDelegate()->ContentsMouseEvent(
+ web_contents_, gfx::Screen::GetCursorScreenPoint(), true);
break;
default:
break;
@@ -543,16 +543,16 @@ void WebContentsViewAura::OnWindowDestroyed() {
void WebContentsViewAura::OnWindowVisibilityChanged(bool visible) {
if (visible)
- tab_contents_->ShowContents();
+ web_contents_->ShowContents();
else
- tab_contents_->HideContents();
+ web_contents_->HideContents();
}
////////////////////////////////////////////////////////////////////////////////
// WebContentsViewAura, aura::client::DragDropDelegate implementation:
void WebContentsViewAura::OnDragEntered(const aura::DropTargetEvent& event) {
if (GetDragDestDelegate())
- GetDragDestDelegate()->DragInitialize(tab_contents_);
+ GetDragDestDelegate()->DragInitialize(web_contents_);
WebDropData drop_data;
PrepareWebDropData(&drop_data, event.data());
@@ -560,7 +560,7 @@ void WebContentsViewAura::OnDragEntered(const aura::DropTargetEvent& event) {
gfx::Point screen_pt =
GetNativeView()->GetRootWindow()->last_mouse_location();
- tab_contents_->GetRenderViewHost()->DragTargetDragEnter(
+ web_contents_->GetRenderViewHost()->DragTargetDragEnter(
drop_data, event.location(), screen_pt, op);
if (GetDragDestDelegate()) {
@@ -573,7 +573,7 @@ int WebContentsViewAura::OnDragUpdated(const aura::DropTargetEvent& event) {
WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
gfx::Point screen_pt =
GetNativeView()->GetRootWindow()->last_mouse_location();
- tab_contents_->GetRenderViewHost()->DragTargetDragOver(
+ web_contents_->GetRenderViewHost()->DragTargetDragOver(
event.location(), screen_pt, op);
if (GetDragDestDelegate())
@@ -583,13 +583,13 @@ int WebContentsViewAura::OnDragUpdated(const aura::DropTargetEvent& event) {
}
void WebContentsViewAura::OnDragExited() {
- tab_contents_->GetRenderViewHost()->DragTargetDragLeave();
+ web_contents_->GetRenderViewHost()->DragTargetDragLeave();
if (GetDragDestDelegate())
GetDragDestDelegate()->OnDragLeave();
}
int WebContentsViewAura::OnPerformDrop(const aura::DropTargetEvent& event) {
- tab_contents_->GetRenderViewHost()->DragTargetDrop(
+ web_contents_->GetRenderViewHost()->DragTargetDrop(
event.location(),
GetNativeView()->GetRootWindow()->last_mouse_location());
if (GetDragDestDelegate())
« content/browser/web_contents/interstitial_page_impl.cc ('K') | « content/browser/web_contents/web_contents_view_aura.h ('k') | content/browser/web_contents/web_contents_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698