diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 16:18:35 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 16:18:35 +0000 |
commit | 6eddfd447c7c6f3e0fb9a5e46761c857592e9efd (patch) | |
tree | 12558656e0d7804a5b456e126f1ca4e5fbbdeca7 /chrome/browser | |
parent | 2efdbfd1a2f7c3eda02d44c66dafd3266fe407f7 (diff) | |
download | chromium_src-6eddfd447c7c6f3e0fb9a5e46761c857592e9efd.zip chromium_src-6eddfd447c7c6f3e0fb9a5e46761c857592e9efd.tar.gz chromium_src-6eddfd447c7c6f3e0fb9a5e46761c857592e9efd.tar.bz2 |
TabContents -> WebContentsImpl, part 5.
TabContentsViewAura -> WebContentsViewAura
TabContentsViewGtk -> WebContentsViewGtk
TabContentsViewHelper -> WebContentsViewHelper
TabContentsViewWin -> WebContentsViewWin
BUG=105875
TEST=no change
Review URL: https://chromiumcodereview.appspot.com/10031044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
10 files changed, 18 insertions, 18 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 8837941..f2c21d1 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -39,8 +39,8 @@ include_rules = [ "+content/browser/download/download_state_info.h", # TODO(ben): http://crbug.com/118410 will fix the following: "+content/browser/renderer_host/render_view_host_factory.h", - "+content/browser/tab_contents/tab_contents_view_helper.h", "+content/browser/web_contents/web_contents_drag_win.h", + "+content/browser/web_contents/web_contents_view_helper.h", "+content/browser/web_contents/web_drag_dest_win.h", # DO NOT ADD ANY MORE ITEMS TO THE ABOVE LIST! diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 7310a6d..2eb7a5f 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -361,8 +361,8 @@ void DragBookmarks(Profile* profile, if (widget) { widget->RunShellDrag(NULL, data, gfx::Point(), operation); } else { - // We hit this case when we're using TabContentsViewWin or - // TabContentsViewAura, instead of TabContentsViewViews. + // We hit this case when we're using WebContentsViewWin or + // WebContentsViewAura, instead of TabContentsViewViews. views::RunShellDrag(view, data, gfx::Point(), operation); } diff --git a/chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.cc b/chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.cc index 2d5de417..199a469 100644 --- a/chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.cc +++ b/chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.cc @@ -110,7 +110,7 @@ gboolean ChromeWebContentsViewDelegateGtk::OnNativeViewFocusEvent( return TRUE; } - // Let the default TabContentsViewGtk::OnFocus() behaviour run. + // Let the default WebContentsViewGtk::OnFocus() behaviour run. return FALSE; } diff --git a/chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.h b/chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.h index 758145b..5afc7da 100644 --- a/chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.h +++ b/chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.h @@ -20,7 +20,7 @@ namespace content { class WebContents; } -// A chrome/ specific class that extends TabContentsViewGtk with features like +// A chrome/ specific class that extends WebContentsViewGtk with features like // constrained windows, which live in chrome/. class ChromeWebContentsViewDelegateGtk : public content::WebContentsViewDelegate { @@ -35,7 +35,7 @@ class ChromeWebContentsViewDelegateGtk ui::FocusStoreGtk* focus_store() { return focus_store_; } // Unlike Windows, ConstrainedWindows need to collaborate with the - // TabContentsViewGtk to position the dialogs. + // WebContentsViewGtk to position the dialogs. void AttachConstrainedWindow(ConstrainedWindowGtk* constrained_window); void RemoveConstrainedWindow(ConstrainedWindowGtk* constrained_window); diff --git a/chrome/browser/tab_contents/chrome_web_contents_view_delegate_views.h b/chrome/browser/tab_contents/chrome_web_contents_view_delegate_views.h index cbf6486..0ec4491 100644 --- a/chrome/browser/tab_contents/chrome_web_contents_view_delegate_views.h +++ b/chrome/browser/tab_contents/chrome_web_contents_view_delegate_views.h @@ -24,7 +24,7 @@ class FocusManager; class Widget; } -// A chrome specific class that extends TabContentsViewWin with features like +// A chrome specific class that extends WebContentsViewWin with features like // constrained windows, which live in chrome. class ChromeWebContentsViewDelegateViews : public content::WebContentsViewDelegate { diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 1313a3b..249c796 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -1431,7 +1431,7 @@ void BrowserWindowGtk::UpdateDevToolsForContents(WebContents* contents) { devtools_container_->SetTab(devtools_contents); if (devtools_contents) { - // TabContentsViewGtk::WasShown is not called when tab contents is shown by + // WebContentsViewGtk::WasShown is not called when tab contents is shown by // anything other than user selecting a Tab. // See TabContentsViewViews::OnWindowPosChanged for reference on how it // should be implemented. diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc index 37361e2..f962912 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc @@ -120,7 +120,7 @@ void NativeTabContentsContainerWin::RequestFocus() { // don't send it to listeners. views::AutoNativeNotificationDisabler local_notification_disabler; views::FocusManager* focus_manager = GetFocusManager(); - if (focus_manager) // NULL in unittests when using TabContentsViewWin. + if (focus_manager) // NULL in unittests when using WebContentsViewWin. focus_manager->ClearFocus(); } View::RequestFocus(); diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc index 76a26fb..39fabd0 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc @@ -22,7 +22,7 @@ using content::WebContents; namespace { -// See comment above TempParent in tab_contents_view_win.cc. +// See comment above TempParent in web_contents_view_win.cc. // Also, Tabs must be created as child widgets, otherwise they will be given // a FocusManager which will conflict with the FocusManager of the // window they eventually end up attached to. diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc index d37c85f..5b44826 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc @@ -270,19 +270,19 @@ views::Widget* TabContentsViewViews::GetSadTab() const { void TabContentsViewViews::CreateNewWindow( int route_id, const ViewHostMsg_CreateWindow_Params& params) { - tab_contents_view_helper_.CreateNewWindow(web_contents_, route_id, params); + web_contents_view_helper_.CreateNewWindow(web_contents_, route_id, params); } void TabContentsViewViews::CreateNewWidget( int route_id, WebKit::WebPopupType popup_type) { - tab_contents_view_helper_.CreateNewWidget(web_contents_, + web_contents_view_helper_.CreateNewWidget(web_contents_, route_id, false, popup_type); } void TabContentsViewViews::CreateNewFullscreenWidget(int route_id) { - tab_contents_view_helper_.CreateNewWidget(web_contents_, + web_contents_view_helper_.CreateNewWidget(web_contents_, route_id, true, WebKit::WebPopupTypeNone); @@ -292,20 +292,20 @@ void TabContentsViewViews::ShowCreatedWindow(int route_id, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture) { - tab_contents_view_helper_.ShowCreatedWindow( + web_contents_view_helper_.ShowCreatedWindow( web_contents_, route_id, disposition, initial_pos, user_gesture); } void TabContentsViewViews::ShowCreatedWidget( int route_id, const gfx::Rect& initial_pos) { - tab_contents_view_helper_.ShowCreatedWidget(web_contents_, + web_contents_view_helper_.ShowCreatedWidget(web_contents_, route_id, false, initial_pos); } void TabContentsViewViews::ShowCreatedFullscreenWidget(int route_id) { - tab_contents_view_helper_.ShowCreatedWidget(web_contents_, + web_contents_view_helper_.ShowCreatedWidget(web_contents_, route_id, true, gfx::Rect()); diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h index 41b9e78..8e8522a 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/timer.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h" -#include "content/browser/tab_contents/tab_contents_view_helper.h" +#include "content/browser/web_contents/web_contents_view_helper.h" #include "content/public/browser/web_contents_view.h" #include "ui/views/widget/widget.h" @@ -128,7 +128,7 @@ class TabContentsViewViews : public views::Widget, content::WebContents* web_contents_; // Common implementations of some WebContentsView methods. - TabContentsViewHelper tab_contents_view_helper_; + WebContentsViewHelper web_contents_view_helper_; NativeTabContentsView* native_tab_contents_view_; |