diff options
102 files changed, 396 insertions, 390 deletions
diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index 6c4799e..b387364 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -27,10 +27,10 @@ #include "chrome/installer/util/browser_distribution.h" #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "content/public/browser/web_contents_view.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/autofill/autofill_external_delegate_gtk.cc b/chrome/browser/autofill/autofill_external_delegate_gtk.cc index eb44a87..34f6c2a 100644 --- a/chrome/browser/autofill/autofill_external_delegate_gtk.cc +++ b/chrome/browser/autofill/autofill_external_delegate_gtk.cc @@ -6,8 +6,8 @@ #include "chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" AutofillExternalDelegate* AutofillExternalDelegate::Create( TabContentsWrapper* tab_contents_wrapper, diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 85c7f3a..06d1ec5 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -81,10 +81,10 @@ #include "content/browser/download/save_package.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/ssl/ssl_manager.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 21e5702..f6c30ab 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -25,9 +25,9 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/interstitial_page.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "net/test/test_server.h" #if defined(TOOLKIT_VIEWS) || defined(OS_WIN) diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index e7a947f..6ba0dcd 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -18,10 +18,10 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "net/test/test_server.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index f1196ad..15542ad3 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -77,10 +77,10 @@ #include "content/browser/ssl/ssl_cert_error_handler.h" #include "content/browser/ssl/ssl_client_auth_handler.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/worker_host/worker_process_host.h" #include "content/public/browser/browser_main_parts.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" #include "net/base/cookie_monster.h" @@ -306,7 +306,7 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts( return main_parts; } -TabContentsView* ChromeContentBrowserClient::CreateTabContentsView( +content::WebContentsView* ChromeContentBrowserClient::CreateWebContentsView( WebContents* web_contents) { #if defined(TOOLKIT_VIEWS) return new TabContentsViewViews(web_contents); @@ -314,9 +314,9 @@ TabContentsView* ChromeContentBrowserClient::CreateTabContentsView( return new content::TabContentsViewGtk(web_contents, new ChromeTabContentsViewWrapperGtk); #elif defined(OS_MACOSX) - return tab_contents_view_mac::CreateTabContentsView(web_contents); + return tab_contents_view_mac::CreateWebContentsView(web_contents); #else -#error Need to create your platform TabContentsView here. +#error Need to create your platform WebContentsView here. #endif } diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h index 0ba18fe..dea7912 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -17,7 +17,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { public: virtual content::BrowserMainParts* CreateBrowserMainParts( const content::MainFunctionParams& parameters) OVERRIDE; - virtual TabContentsView* CreateTabContentsView( + virtual content::WebContentsView* CreateWebContentsView( content::WebContents* web_contents) OVERRIDE; virtual void RenderViewHostCreated(RenderViewHost* render_view_host) OVERRIDE; virtual void RenderProcessHostCreated( diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc index fcbcd0fd..9b11557 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.cc +++ b/chrome/browser/chromeos/external_protocol_dialog.cc @@ -11,8 +11,8 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc index 60472ca..34791c8 100644 --- a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc +++ b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc @@ -31,7 +31,7 @@ class TestOfflineLoadPage : public chromeos::OfflineLoadPage { } // Overriden from InterstitialPage. Don't create a view. - virtual TabContentsView* CreateTabContentsView() OVERRIDE { + virtual content::WebContentsView* CreateWebContentsView() OVERRIDE { return NULL; } diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.cc b/chrome/browser/chromeos/tab_closeable_state_watcher.cc index 9d4c3d8..9afafe0 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,9 +12,9 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" namespace chromeos { diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index a5a0c7f..160dd62 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -34,7 +34,6 @@ #include "content/browser/in_process_webkit/session_storage_namespace.h" #include "content/browser/load_notification_details.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/devtools_agent_host_registry.h" #include "content/public/browser/devtools_manager.h" @@ -44,6 +43,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/common/bindings_policy.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index ff07d8a..a47c8eb 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -33,12 +33,12 @@ #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index cb3cfef..538cc23 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -46,12 +46,12 @@ #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 629953f..abb1a23 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -36,7 +36,6 @@ #include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/provisional_load_details.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/favicon_status.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" @@ -49,6 +48,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "content/public/browser/web_contents_view.h" #include "net/http/http_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 6958a04..863914a 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -26,11 +26,11 @@ #include "content/browser/in_process_webkit/session_storage_namespace.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_request_details.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "content/public/browser/web_contents_view.h" #include "ui/gfx/rect.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index 98b18c0..ca5c0fd 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -28,7 +28,6 @@ #include "chrome/common/print_messages.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" @@ -36,6 +35,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" #include "ui/base/l10n/l10n_util.h" #include "webkit/glue/webpreferences.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index 0df79d6..1709ebf 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -21,9 +21,9 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "content/test/test_browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc index fc1c3ed..cbc3aa8 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -15,6 +15,7 @@ using content::BrowserThread; using content::NavigationEntry; using content::WebContents; +using content::WebContentsView; static const char* kGoogleURL = "http://www.google.com/"; static const char* kGoodURL = "http://www.goodguys.com/"; @@ -34,7 +35,7 @@ class TestSafeBrowsingBlockingPage : public SafeBrowsingBlockingPage { } // Overriden from InterstitialPage. Don't create a view. - virtual TabContentsView* CreateTabContentsView() { + virtual WebContentsView* CreateWebContentsView() { return NULL; } }; diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index 61a204b..0a80501 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -26,8 +26,8 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "content/test/test_browser_thread.h" #include "crypto/sha2.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index 1885791..9f8e83b 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -31,11 +31,11 @@ #include "chrome/common/chrome_notification_types.h" #include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "net/base/network_change_notifier.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/speech/speech_input_bubble_mac.mm b/chrome/browser/speech/speech_input_bubble_mac.mm index d2fcedd..53ea4b6 100644 --- a/chrome/browser/speech/speech_input_bubble_mac.mm +++ b/chrome/browser/speech/speech_input_bubble_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,8 +12,8 @@ #include "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #import "chrome/browser/ui/cocoa/speech_input_window_controller.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "skia/ext/skia_utils_mac.h" using content::WebContents; diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index 5cad3ff..9c07860 100644 --- a/chrome/browser/speech/speech_input_bubble_views.cc +++ b/chrome/browser/speech/speech_input_bubble_views.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,8 +14,8 @@ #include "chrome/browser/ui/views/window.h" #include "content/browser/resource_context.h" #include "content/browser/speech/speech_input_manager.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.h b/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.h index a9e0eb6..75e9a2e 100644 --- a/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.h +++ b/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.h @@ -15,8 +15,8 @@ #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/tab_contents/tab_contents_view_helper.h" +#include "content/public/browser/web_contents_view.h" #include "ui/base/cocoa/base_view.h" #include "ui/gfx/size.h" @@ -49,9 +49,9 @@ class Point; - (void)setFrameWithDeferredUpdate:(NSRect)frame; @end -// Mac-specific implementation of the TabContentsView. It owns an NSView that +// Mac-specific implementation of the WebContentsView. It owns an NSView that // contains all of the contents of the tab and associated child views. -class TabContentsViewMac : public TabContentsView { +class TabContentsViewMac : public content::WebContentsView { public: // The corresponding TabContents is passed in the constructor, and manages our // lifetime. This doesn't need to be the case, but is this way currently @@ -60,7 +60,7 @@ class TabContentsViewMac : public TabContentsView { explicit TabContentsViewMac(content::WebContents* web_contents); virtual ~TabContentsViewMac(); - // TabContentsView implementation -------------------------------------------- + // WebContentsView implementation -------------------------------------------- virtual void CreateView(const gfx::Size& initial_size) OVERRIDE; virtual RenderWidgetHostView* CreateViewForWidget( @@ -125,7 +125,7 @@ class TabContentsViewMac : public TabContentsView { // The TabContents whose contents we display. TabContents* tab_contents_; - // Common implementations of some TabContentsView methods. + // Common implementations of some WebContentsView methods. TabContentsViewHelper tab_contents_view_helper_; // The Cocoa NSView that lives in the view hierarchy. @@ -148,14 +148,14 @@ class TabContentsViewMac : public TabContentsView { #endif // __OBJC__ // Functions that may be accessed from non-Objective-C C/C++ code. -class TabContentsView; - namespace content { class WebContents; +class WebContentsView; } namespace tab_contents_view_mac { -TabContentsView* CreateTabContentsView(content::WebContents* web_contents); +content::WebContentsView* CreateWebContentsView( + content::WebContents* web_contents); } #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_ diff --git a/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm b/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm index d8f338f..34af1553 100644 --- a/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm +++ b/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm @@ -63,7 +63,7 @@ COMPILE_ASSERT_MATCHING_ENUM(DragOperationEvery); @end namespace tab_contents_view_mac { -TabContentsView* CreateTabContentsView(WebContents* web_contents) { +content::WebContentsView* CreateWebContentsView(WebContents* web_contents) { return new TabContentsViewMac(web_contents); } } @@ -202,7 +202,7 @@ void TabContentsViewMac::OnTabCrashed(base::TerminationStatus /* status */, void TabContentsViewMac::SizeContents(const gfx::Size& size) { // TODO(brettw | japhet) This is a hack and should be removed. - // See tab_contents_view.h. + // See web_contents_view.h. gfx::Rect rect(gfx::Point(), size); TabContentsViewCocoa* view = cocoa_view_.get(); [view setFrame:[view flipRectToNSRect:rect]]; diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc index 996df73..bf2ee29 100644 --- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc +++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -25,10 +25,10 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "content/browser/ssl/ssl_client_auth_handler.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources_standard.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index 77db0a4..86f6406 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -25,7 +25,6 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" @@ -33,6 +32,7 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "content/public/browser/web_contents_view.h" using content::NavigationController; using content::NavigationEntry; @@ -719,8 +719,8 @@ void TabStripModel::AddTabContents(TabContentsWrapper* contents, // TODO(sky): figure out why this is here and not in InsertTabContentsAt. When // here we seem to get failures in startup perf tests. - // Ensure that the new TabContentsView begins at the same size as the - // previous TabContentsView if it existed. Otherwise, the initial WebKit + // Ensure that the new WebContentsView begins at the same size as the + // previous WebContentsView if it existed. Otherwise, the initial WebKit // layout will be performed based on a width of 0 pixels, causing a // very long, narrow, inaccurate layout. Because some scripts on pages (as // well as WebKit's anchor link location calculation) are run on the diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index cfd082a..4dc0864 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -150,7 +150,6 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/interstitial_page.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/devtools_manager.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" @@ -162,6 +161,7 @@ #include "content/public/browser/plugin_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_intents_dispatcher.h" #include "content/public/common/content_restriction.h" #include "content/public/common/content_switches.h" diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index d59e0bf..8338322 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -28,9 +28,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/component_updater/component_updater_service.h" #include "chrome/browser/component_updater/flash_component_installer.h" +#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" #include "chrome/browser/component_updater/recovery_component_installer.h" #include "chrome/browser/component_updater/swiftshader_component_installer.h" -#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_creator.h" @@ -78,10 +78,10 @@ #include "chrome/common/url_constants.h" #include "chrome/installer/util/browser_distribution.h" #include "content/browser/child_process_security_policy.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -103,8 +103,8 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" -#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" #include "chrome/browser/chromeos/customization_document.h" +#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" #include "chrome/browser/chromeos/enterprise_extension_observer.h" #include "chrome/browser/chromeos/gview_request_interceptor.h" #include "chrome/browser/chromeos/network_message_observer.h" diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index 238d1a6..b33abc5 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -21,10 +21,10 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" using content::WebContents; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 377fff15..1cf8ba0 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -41,9 +41,9 @@ #import "chrome/browser/ui/cocoa/view_resizer.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index f111555..c321432 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -32,8 +32,8 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/pref_names.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "ui/base/ui_base_types.h" using content::WebContents; diff --git a/chrome/browser/ui/cocoa/constrained_window_mac.mm b/chrome/browser/ui/cocoa/constrained_window_mac.mm index 0ce4f8f..4f8a254 100644 --- a/chrome/browser/ui/cocoa/constrained_window_mac.mm +++ b/chrome/browser/ui/cocoa/constrained_window_mac.mm @@ -7,8 +7,8 @@ #import "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #import "third_party/GTM/AppKit/GTMWindowSheetController.h" ConstrainedWindowMacDelegateSystemSheet:: diff --git a/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm b/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm index cda92a4..116d7b4 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include "chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" // The minimum/maximum dimensions of the popup. const CGFloat ExtensionViewMac::kMinWidth = 25.0; diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm index 35e5ff0..71f4c8a 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,8 +7,8 @@ #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/ui/cocoa/browser_window_controller.h" -#import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" +#import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h" #import "chrome/browser/ui/cocoa/focus_tracker.h" @@ -19,8 +19,8 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #import "content/browser/find_pasteboard.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" const float kFindBarOpenDuration = 0.2; diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm b/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm index 5cbb8f1..1de4f77 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,8 +7,8 @@ #import <Cocoa/Cocoa.h> #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" BalloonViewHost::BalloonViewHost(Balloon* balloon) : BalloonHost(balloon) { diff --git a/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h index 396dfaf..26e65b3 100644 --- a/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h +++ b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -34,7 +34,7 @@ class WebContents; @property(readonly, nonatomic) NSView* activeContainer; -// Sets the current preview and installs its TabContentsView into the view +// Sets the current preview and installs its WebContentsView into the view // hierarchy. Hides the active view. |preview| must not be NULL. - (void)showPreview:(content::WebContents*)preview; diff --git a/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_unittest.mm index 38e75dd..962b040 100644 --- a/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_unittest.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -26,7 +26,7 @@ class PreviewableContentsControllerTest : public CocoaTest { TEST_VIEW(PreviewableContentsControllerTest, [controller_ view]) // TODO(rohitrao): Test showing and hiding the preview. This may require -// changing the interface to take in a TabContentsView* instead of a +// changing the interface to take in a WebContentsView* instead of a // TabContents*. } // namespace diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 9c8f0a2..54f2dda 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -50,10 +50,10 @@ #include "chrome/browser/ui/tabs/tab_menu_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" diff --git a/chrome/browser/ui/cocoa/web_intent_bubble_controller.mm b/chrome/browser/ui/cocoa/web_intent_bubble_controller.mm index 6e6b321..4c957ca 100644 --- a/chrome/browser/ui/cocoa/web_intent_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/web_intent_bubble_controller.mm @@ -6,13 +6,13 @@ #include "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/browser_list.h" +#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" -#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" #include "chrome/browser/ui/cocoa/web_intent_picker_cocoa.h" #include "chrome/browser/ui/intents/web_intent_picker_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/constrained_window.h b/chrome/browser/ui/constrained_window.h index c3bdf25..5326ad6 100644 --- a/chrome/browser/ui/constrained_window.h +++ b/chrome/browser/ui/constrained_window.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,7 +13,7 @@ // ConstrainedWindow // // This interface represents a window that is constrained to a -// TabContentsView's bounds. +// WebContentsView's bounds. // class ConstrainedWindow { public: diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index f494bc1..c42d9c6 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,10 +20,10 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "net/test/test_server.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc index 1f747b3..262b1d2 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc @@ -34,11 +34,11 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 2f636e8..48d77fd 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -80,11 +80,11 @@ #include "chrome/common/pref_names.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc index 5fc3b10..dcf7d90 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.cc +++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc @@ -93,8 +93,8 @@ ConstrainedWindowGtk::~ConstrainedWindowGtk() { void ConstrainedWindowGtk::ShowConstrainedWindow() { gtk_widget_show_all(border_.get()); - // We collaborate with TabContentsView and stick ourselves in the - // TabContentsView's floating container. + // We collaborate with WebContentsView and stick ourselves in the + // WebContentsView's floating container. ContainingView()->AttachConstrainedWindow(this); visible_ = true; diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.h b/chrome/browser/ui/gtk/constrained_window_gtk.h index d0d456f..686a3cc 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.h +++ b/chrome/browser/ui/gtk/constrained_window_gtk.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -85,7 +85,7 @@ class ConstrainedWindowGtk : public ConstrainedWindow { // The TabContentsWrapper that owns and constrains this ConstrainedWindow. TabContentsWrapper* wrapper_; - // The top level widget container that exports to our TabContentsView. + // The top level widget container that exports to our WebContentsView. ui::OwnedWidgetGtk border_; // Delegate that provides the contents of this constrained window. diff --git a/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc index 9266af8..c79db2e 100644 --- a/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" ExtensionViewGtk::ExtensionViewGtk(ExtensionHost* extension_host, Browser* browser) diff --git a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc index c22e5eb..96596a5 100644 --- a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc +++ b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc @@ -25,11 +25,11 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view_gtk.h" #include "content/browser/site_instance.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/sad_tab_observer.cc b/chrome/browser/ui/sad_tab_observer.cc index 7df7700..d99ef9d 100644 --- a/chrome/browser/ui/sad_tab_observer.cc +++ b/chrome/browser/ui/sad_tab_observer.cc @@ -1,14 +1,14 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/ui/sad_tab_observer.h" #include "chrome/browser/browser_shutdown.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #if defined(OS_MACOSX) #include "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h" diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc index d6678c1..e99851a 100644 --- a/chrome/browser/ui/views/constrained_window_views.cc +++ b/chrome/browser/ui/views/constrained_window_views.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -17,8 +17,8 @@ #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -47,9 +47,9 @@ #endif #if defined(USE_AURA) -#include "base/command_line.h" #include "ash/ash_switches.h" #include "ash/shell.h" +#include "base/command_line.h" #endif using base::TimeDelta; diff --git a/chrome/browser/ui/views/dropdown_bar_host_win.cc b/chrome/browser/ui/views/dropdown_bar_host_win.cc index 0737d52..1745689 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_win.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,8 +7,8 @@ #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" diff --git a/chrome/browser/ui/views/extensions/extension_view.cc b/chrome/browser/ui/views/extensions/extension_view.cc index 0514d59..281aa2b 100644 --- a/chrome/browser/ui/views/extensions/extension_view.cc +++ b/chrome/browser/ui/views/extensions/extension_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,9 +8,9 @@ #include "chrome/browser/ui/views/extensions/extension_popup.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "ui/views/widget/widget.h" ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser) diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index 2320445..802e3c6 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,8 +13,8 @@ #include "chrome/browser/ui/views/find_bar_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/focus/external_focus_tracker.h" #include "ui/views/focus/view_storage.h" @@ -157,7 +157,7 @@ bool FindBarHost::IsFindBarVisible() { void FindBarHost::RestoreSavedFocus() { if (focus_tracker() == NULL) { - // TODO(brettw) Focus() should be on TabContentsView. + // TODO(brettw) Focus() should be on WebContentsView. find_bar_controller_->tab_contents()->web_contents()->Focus(); } else { focus_tracker()->FocusLastFocusedExternalView(); @@ -324,7 +324,7 @@ void FindBarHost::UnregisterAccelerators() { void FindBarHost::GetWidgetPositionNative(gfx::Rect* avoid_overlapping_rect) { gfx::Rect frame_rect = host()->GetTopLevelWidget()->GetWindowScreenBounds(); - TabContentsView* tab_view = + content::WebContentsView* tab_view = find_bar_controller_->tab_contents()->web_contents()->GetView(); gfx::Rect webcontents_rect; tab_view->GetViewBounds(&webcontents_rect); diff --git a/chrome/browser/ui/views/find_bar_host_win.cc b/chrome/browser/ui/views/find_bar_host_win.cc index 2e8b46b..d8edd6d 100644 --- a/chrome/browser/ui/views/find_bar_host_win.cc +++ b/chrome/browser/ui/views/find_bar_host_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/web_contents_view.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h index aa20877..04c8e80 100644 --- a/chrome/browser/ui/views/find_bar_view.h +++ b/chrome/browser/ui/views/find_bar_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -125,7 +125,7 @@ class FindBarView : public DropdownBarView, }; // Returns the OS-specific view for the find bar that acts as an intermediary - // between us and the TabContentsView. + // between us and the WebContentsView. FindBarHost* find_bar_host() const; // The controls in the window. diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 0a8a7b0..31173f3 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -77,11 +77,11 @@ #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/common/content_switches.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/html_dialog_view_browsertest.cc b/chrome/browser/ui/views/html_dialog_view_browsertest.cc index 37ce254..d1fb2b7 100644 --- a/chrome/browser/ui/views/html_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/html_dialog_view_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,8 +15,8 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index c37a512..654552e 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -11,9 +11,9 @@ #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/constrained_window_views.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc index 7a97857..3644ac9a 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc @@ -9,12 +9,12 @@ #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view_aura.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/drag_drop_delegate.h" -#include "ui/aura/root_window.h" #include "ui/aura/event.h" +#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc index 7e5e611..133ccbd 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc @@ -1,20 +1,20 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/ui/gtk/constrained_window_gtk.h" #include "chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.h" +#include "chrome/browser/ui/gtk/constrained_window_gtk.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h" #include "content/browser/renderer_host/render_widget_host_view_gtk.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/tab_contents/web_drag_dest_gtk.h" #include "content/browser/tab_contents/web_drag_source_gtk.h" #include "content/public/browser/web_contents.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h" +#include "content/public/browser/web_contents_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h index 51f451a..435b3c2 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -67,7 +67,7 @@ class NativeTabContentsViewGtk : public views::NativeWidgetGtk, // Whether to ignore the next CHAR keyboard event. bool ignore_next_char_event_; - // Handles drags from this TabContentsView. + // Handles drags from this WebContentsView. scoped_ptr<content::WebDragSourceGtk> drag_source_; // The event for the last mouse down we handled. We need this for drags. 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 9d31ad1..953e7bf 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 @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h" #include "chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h" #include "content/browser/renderer_host/render_widget_host_view_win.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc index de2d6d6..e201bee 100644 --- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc +++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h index 97eb237..17f6871 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/platform_thread.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/gfx/point.h" @@ -19,7 +19,7 @@ class NativeTabContentsViewWin; class WebDragSource; struct WebDropData; -// Windows-specific drag-and-drop handling in TabContentsView. +// Windows-specific drag-and-drop handling in WebContentsView. // If we are dragging a virtual file out of the browser, we use a background // thread to do the drag-and-drop because we do not want to run nested // message loop in the UI thread. For all other cases, the drag-and-drop happens 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 d3130d0..a8ff771 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,8 +10,8 @@ #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.h" #include "content/browser/tab_contents/tab_contents_view_helper.h" +#include "content/public/browser/web_contents_view.h" #include "ui/views/widget/widget.h" class ConstrainedWindowGtk; @@ -27,9 +27,9 @@ namespace views { class Widget; } -// Views-specific implementation of the TabContentsView. +// Views-specific implementation of the WebContentsView. class TabContentsViewViews : public views::Widget, - public TabContentsView, + public content::WebContentsView, public internal::NativeTabContentsViewDelegate { public: // The corresponding WebContents is passed in the constructor, and manages our @@ -51,7 +51,7 @@ class TabContentsViewViews : public views::Widget, return native_tab_contents_view_; } - // Overridden from TabContentsView: + // Overridden from WebContentsView: virtual void CreateView(const gfx::Size& initial_size) OVERRIDE; virtual RenderWidgetHostView* CreateViewForWidget( RenderWidgetHost* render_widget_host) OVERRIDE; @@ -147,7 +147,7 @@ class TabContentsViewViews : public views::Widget, // The WebContents whose contents we display. content::WebContents* web_contents_; - // Common implementations of some TabContentsView methods. + // Common implementations of some WebContentsView methods. TabContentsViewHelper tab_contents_view_helper_; NativeTabContentsView* native_tab_contents_view_; diff --git a/chrome/browser/ui/webui/cloud_print_signin_dialog.cc b/chrome/browser/ui/webui/cloud_print_signin_dialog.cc index 25690943..5361cef 100644 --- a/chrome/browser/ui/webui/cloud_print_signin_dialog.cc +++ b/chrome/browser/ui/webui/cloud_print_signin_dialog.cc @@ -20,7 +20,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_registrar.h" @@ -28,6 +27,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui_message_handler.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc index 6a66c9c..f68e028 100644 --- a/chrome/browser/ui/webui/options/advanced_options_handler.cc +++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -28,12 +28,12 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/common/page_zoom.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_win.cc b/chrome/browser/ui/webui/options/advanced_options_utils_win.cc index 9d8f883..33e66d9 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_win.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,9 +14,9 @@ #include "base/path_service.h" #include "base/threading/thread.h" #include "chrome/browser/browser_process.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" using content::BrowserThread; using content::WebContents; diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc index 149a426..ac58c40 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,9 +15,9 @@ #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/certificate_dialogs.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" -#include "content/public/browser/web_contents.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/browser_thread.h" // for FileAccessProvider +#include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "net/base/crypto_module.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc index b2c07fa..9229c71 100644 --- a/chrome/browser/ui/webui/options/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc @@ -33,10 +33,10 @@ #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/options2/advanced_options_handler2.cc b/chrome/browser/ui/webui/options2/advanced_options_handler2.cc index efeaecf..2b82b14 100644 --- a/chrome/browser/ui/webui/options2/advanced_options_handler2.cc +++ b/chrome/browser/ui/webui/options2/advanced_options_handler2.cc @@ -29,12 +29,12 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/common/page_zoom.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/options2/advanced_options_utils2_win.cc b/chrome/browser/ui/webui/options2/advanced_options_utils2_win.cc index c12f14e..0c8b99d 100644 --- a/chrome/browser/ui/webui/options2/advanced_options_utils2_win.cc +++ b/chrome/browser/ui/webui/options2/advanced_options_utils2_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,9 +14,9 @@ #include "base/path_service.h" #include "base/threading/thread.h" #include "chrome/browser/browser_process.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" using content::BrowserThread; using content::WebContents; diff --git a/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc b/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc index 804016ad..5e6e836 100644 --- a/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc +++ b/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,9 +15,9 @@ #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/certificate_dialogs.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "net/base/crypto_module.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/ui/webui/tracing_ui.cc b/chrome/browser/ui/webui/tracing_ui.cc index c604e54..6fc78db 100644 --- a/chrome/browser/ui/webui/tracing_ui.cc +++ b/chrome/browser/ui/webui/tracing_ui.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,10 +20,10 @@ #include "chrome/common/url_constants.h" #include "content/browser/gpu/gpu_data_manager.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/trace_controller.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" diff --git a/content/browser/mock_content_browser_client.cc b/content/browser/mock_content_browser_client.cc index 31cd447..6718d6e 100644 --- a/content/browser/mock_content_browser_client.cc +++ b/content/browser/mock_content_browser_client.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,10 +6,10 @@ #include <string> -#include "base/logging.h" #include "base/file_path.h" +#include "base/logging.h" #include "content/browser/webui/empty_web_ui_factory.h" -#include "content/test/test_tab_contents_view.h" +#include "content/test/test_web_contents_view.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h" @@ -28,9 +28,9 @@ BrowserMainParts* MockContentBrowserClient::CreateBrowserMainParts( return NULL; } -TabContentsView* MockContentBrowserClient::CreateTabContentsView( +WebContentsView* MockContentBrowserClient::CreateWebContentsView( WebContents* web_contents) { - return new TestTabContentsView; + return new TestWebContentsView; } void MockContentBrowserClient::RenderViewHostCreated( diff --git a/content/browser/mock_content_browser_client.h b/content/browser/mock_content_browser_client.h index ef52b51..128cf71 100644 --- a/content/browser/mock_content_browser_client.h +++ b/content/browser/mock_content_browser_client.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -23,7 +23,7 @@ class MockContentBrowserClient : public ContentBrowserClient { virtual BrowserMainParts* CreateBrowserMainParts( const content::MainFunctionParams& parameters) OVERRIDE; - virtual TabContentsView* CreateTabContentsView( + virtual WebContentsView* CreateWebContentsView( WebContents* web_contents) OVERRIDE; virtual void RenderViewHostCreated( RenderViewHost* render_view_host) OVERRIDE; diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc index 4dd3112..7dacf1d 100644 --- a/content/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -165,7 +165,7 @@ class RenderWidgetHostViewGtkWidget { // Connect after so that we are called after the handler installed by the - // TabContentsView which handles zoom events. + // WebContentsView which handles zoom events. g_signal_connect_after(widget, "scroll-event", G_CALLBACK(OnMouseScrollEvent), host_view); @@ -529,7 +529,7 @@ class RenderWidgetHostViewGtkWidget { RenderWidgetHostViewGtk* host_view) { // If the user is holding shift, translate it into a horizontal scroll. We // don't care what other modifiers the user may be holding (zooming is - // handled at the TabContentsView level). + // handled at the WebContentsView level). if (event->state & GDK_SHIFT_MASK) { if (event->direction == GDK_SCROLL_UP) event->direction = GDK_SCROLL_LEFT; diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index de94788..071ed59 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -19,10 +19,10 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #import "content/browser/accessibility/browser_accessibility_cocoa.h" +#include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/mac/closure_blocks_leopard_compat.h" #include "content/browser/plugin_process_host.h" #import "content/browser/renderer_host/accelerated_plugin_view_mac.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/renderer_host/backing_store_mac.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/renderer_host/render_view_host.h" @@ -1409,7 +1409,7 @@ void RenderWidgetHostViewMac::SetTextInputActive(bool active) { // Command key combinations are sent via performKeyEquivalent rather than // keyDown:. We just forward this on and if WebCore doesn't want to handle - // it, we let the TabContentsView figure out how to reinject it. + // it, we let the WebContentsView figure out how to reinject it. [self keyEvent:theEvent wasKeyEquivalent:YES]; return YES; } diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc index 5cff3ca..cfeaae2 100644 --- a/content/browser/tab_contents/interstitial_page.cc +++ b/content/browser/tab_contents/interstitial_page.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,7 +20,6 @@ #include "content/browser/tab_contents/navigation_controller_impl.h" #include "content/browser/tab_contents/navigation_entry_impl.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/common/dom_storage_common.h" #include "content/common/view_messages.h" #include "content/public/browser/browser_thread.h" @@ -28,6 +27,7 @@ #include "content/public/browser/invalidate_type.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/view_type.h" @@ -39,6 +39,7 @@ using content::NavigationController; using content::NavigationEntry; using content::NavigationEntryImpl; using content::WebContents; +using content::WebContentsView; using WebKit::WebDragOperation; using WebKit::WebDragOperationsMask; @@ -203,7 +204,7 @@ void InterstitialPage::Show() { DCHECK(!render_view_host_); render_view_host_ = CreateRenderViewHost(); - CreateTabContentsView(); + CreateWebContentsView(); std::string data_url = "data:text/html;charset=utf-8," + net::EscapePath(GetHTMLContents()); @@ -432,20 +433,20 @@ RenderViewHost* InterstitialPage::CreateRenderViewHost() { return render_view_host; } -TabContentsView* InterstitialPage::CreateTabContentsView() { - TabContentsView* tab_contents_view = tab()->GetView(); +WebContentsView* InterstitialPage::CreateWebContentsView() { + WebContentsView* web_contents_view = tab()->GetView(); RenderWidgetHostView* view = - tab_contents_view->CreateViewForWidget(render_view_host_); + web_contents_view->CreateViewForWidget(render_view_host_); render_view_host_->SetView(view); render_view_host_->AllowBindings(content::BINDINGS_POLICY_DOM_AUTOMATION); int32 max_page_id = tab()->GetMaxPageIDForSiteInstance(render_view_host_->site_instance()); render_view_host_->CreateRenderView(string16(), max_page_id); - view->SetSize(tab_contents_view->GetContainerSize()); + view->SetSize(web_contents_view->GetContainerSize()); // Don't show the interstitial until we have navigated to it. view->Hide(); - return tab_contents_view; + return web_contents_view; } void InterstitialPage::Proceed() { diff --git a/content/browser/tab_contents/interstitial_page.h b/content/browser/tab_contents/interstitial_page.h index ce786bf..2f78e5d 100644 --- a/content/browser/tab_contents/interstitial_page.h +++ b/content/browser/tab_contents/interstitial_page.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,11 +20,11 @@ #include "ui/gfx/size.h" class TabContents; -class TabContentsView; namespace content { class NavigationEntry; class WebContents; +class WebContentsView; } // This class is a base class for interstitial pages, pages that show some @@ -163,9 +163,9 @@ class CONTENT_EXPORT InterstitialPage : public content::NotificationObserver, // Overriden in unit tests. virtual RenderViewHost* CreateRenderViewHost(); - // Creates the TabContentsView that shows the interstitial RVH. + // Creates the WebContentsView that shows the interstitial RVH. // Overriden in unit tests. - virtual TabContentsView* CreateTabContentsView(); + virtual content::WebContentsView* CreateWebContentsView(); // Notification magic. content::NotificationRegistrar notification_registrar_; diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc index a6ef2b9..bee5c40 100644 --- a/content/browser/tab_contents/render_view_host_manager.cc +++ b/content/browser/tab_contents/render_view_host_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,12 +16,12 @@ #include "content/browser/site_instance.h" #include "content/browser/tab_contents/navigation_controller_impl.h" #include "content/browser/tab_contents/navigation_entry_impl.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/webui/web_ui.h" -#include "content/public/browser/notification_service.h" #include "content/common/view_messages.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui_controller.h" #include "content/public/browser/web_ui_factory.h" #include "content/public/common/content_switches.h" diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index dbc5a5e..2f835de 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -30,7 +30,6 @@ #include "content/browser/tab_contents/interstitial_page.h" #include "content/browser/tab_contents/navigation_entry_impl.h" #include "content/browser/tab_contents/provisional_load_details.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/tab_contents/title_updated_details.h" #include "content/common/intents_messages.h" #include "content/common/view_messages.h" @@ -44,6 +43,7 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui_factory.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/content_constants.h" @@ -217,7 +217,7 @@ TabContents::TabContents(content::BrowserContext* browser_context, ALLOW_THIS_IN_INITIALIZER_LIST(controller_( this, browser_context, session_storage_namespace)), ALLOW_THIS_IN_INITIALIZER_LIST(view_( - content::GetContentClient()->browser()->CreateTabContentsView(this))), + content::GetContentClient()->browser()->CreateWebContentsView(this))), ALLOW_THIS_IN_INITIALIZER_LIST(render_manager_(this, this)), is_loading_(false), crashed_status_(base::TERMINATION_STATUS_STILL_RUNNING), @@ -428,7 +428,7 @@ RenderWidgetHostView* TabContents::GetRenderWidgetHostView() const { return render_manager_.GetRenderWidgetHostView(); } -TabContentsView* TabContents::GetView() const { +content::WebContentsView* TabContents::GetView() const { return view_.get(); } @@ -2173,7 +2173,7 @@ void TabContents::RenderViewGoneFromRenderManager( } void TabContents::UpdateRenderViewSizeForRenderManager() { - // TODO(brettw) this is a hack. See TabContentsView::SizeContents. + // TODO(brettw) this is a hack. See WebContentsView::SizeContents. gfx::Size size = view_->GetContainerSize(); // 0x0 isn't a valid window size (minimal window size is 1x1) but it may be // here during container initialization and normal window size will be set diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 56539a1..5776ee4 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -35,13 +35,13 @@ class LoadNotificationDetails; class RenderViewHost; class SessionStorageNamespace; class SiteInstance; -class TabContentsView; struct ViewHostMsg_DidFailProvisionalLoadWithError_Params; namespace content { class DownloadItem; class WebContentsObserver; class WebContentsDelegate; +class WebContentsView; } namespace webkit_glue { @@ -132,7 +132,7 @@ class CONTENT_EXPORT TabContents virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE; virtual RenderViewHost* GetRenderViewHost() const OVERRIDE; virtual RenderWidgetHostView* GetRenderWidgetHostView() const OVERRIDE; - virtual TabContentsView* GetView() const OVERRIDE; + virtual content::WebContentsView* GetView() const OVERRIDE; virtual content::WebUI* CreateWebUI(const GURL& url) OVERRIDE; virtual content::WebUI* GetWebUI() const OVERRIDE; virtual content::WebUI* GetCommittedWebUI() const OVERRIDE; @@ -361,7 +361,7 @@ class CONTENT_EXPORT TabContents FRIEND_TEST_ALL_PREFIXES(RenderViewHostManagerTest, PageDoesBackAndReload); // Temporary until the view/contents separation is complete. - friend class TabContentsView; + friend class content::WebContentsView; #if defined(TOOLKIT_VIEWS) friend class TabContentsViewViews; #elif defined(OS_MACOSX) @@ -507,7 +507,7 @@ class CONTENT_EXPORT TabContents NavigationControllerImpl controller_; // The corresponding view. - scoped_ptr<TabContentsView> view_; + scoped_ptr<content::WebContentsView> view_; // A list of observers notified when page state changes. Weak references. // This MUST be listed above render_manager_ since at destruction time the diff --git a/content/browser/tab_contents/tab_contents_unittest.cc b/content/browser/tab_contents/tab_contents_unittest.cc index f39f9bc..f9b98b0 100644 --- a/content/browser/tab_contents/tab_contents_unittest.cc +++ b/content/browser/tab_contents/tab_contents_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -172,7 +172,7 @@ class TestInterstitialPage : public InterstitialPage { this, MSG_ROUTING_NONE); } - virtual TabContentsView* CreateTabContentsView() { return NULL; } + virtual content::WebContentsView* CreateWebContentsView() { return NULL; } virtual void CommandReceived(const std::string& command) { @@ -236,7 +236,7 @@ class TabContentsTest : public RenderViewHostTestHarness { // Test to make sure that title updates get stripped of whitespace. TEST_F(TabContentsTest, UpdateTitle) { - NavigationControllerImpl& cont = + NavigationControllerImpl& cont = static_cast<NavigationControllerImpl&>(controller()); ViewHostMsg_FrameNavigate_Params params; InitNavigateParams(¶ms, 0, GURL(chrome::kAboutBlankURL), @@ -252,7 +252,7 @@ TEST_F(TabContentsTest, UpdateTitle) { // Test view source mode for a webui page. TEST_F(TabContentsTest, NTPViewSource) { - NavigationControllerImpl& cont = + NavigationControllerImpl& cont = static_cast<NavigationControllerImpl&>(controller()); const char kUrl[] = "view-source:tabcontentstest://blah"; const GURL kGURL(kUrl); diff --git a/content/browser/tab_contents/tab_contents_view.cc b/content/browser/tab_contents/tab_contents_view.cc deleted file mode 100644 index e4fda32..0000000 --- a/content/browser/tab_contents/tab_contents_view.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "content/browser/tab_contents/tab_contents_view.h" - -TabContentsView::TabContentsView() {} - -TabContentsView::~TabContentsView() {} diff --git a/content/browser/tab_contents/tab_contents_view_gtk.h b/content/browser/tab_contents/tab_contents_view_gtk.h index ccd3c7d..563c408 100644 --- a/content/browser/tab_contents/tab_contents_view_gtk.h +++ b/content/browser/tab_contents/tab_contents_view_gtk.h @@ -11,9 +11,9 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/tab_contents/tab_contents_view_helper.h" #include "content/common/content_export.h" +#include "content/public/browser/web_contents_view.h" #include "ui/base/gtk/focus_store_gtk.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/owned_widget_gtk.h" @@ -25,13 +25,13 @@ class WebDragDestDelegate; class WebDragDestGtk; class WebDragSourceGtk; -class CONTENT_EXPORT TabContentsViewGtk : public TabContentsView { +class CONTENT_EXPORT TabContentsViewGtk : public WebContentsView { public: // The corresponding TabContents is passed in the constructor, and manages // our lifetime. This doesn't need to be the case, but is this way currently // because that's what was easiest when they were split. We optionally take // |wrapper| which creates an intermediary widget layer for features from the - // embedding layer that live with the TabContentsView. + // Embedding layer that lives with the WebContentsView. // TODO(jam): make this take a WebContents once it's created from content. explicit TabContentsViewGtk(content::WebContents* web_contents, TabContentsViewWrapperGtk* wrapper); @@ -49,7 +49,7 @@ class CONTENT_EXPORT TabContentsViewGtk : public TabContentsView { // Allows our embeder to intercept incoming drag messages. void SetDragDestDelegate(WebDragDestDelegate* delegate); - // TabContentsView implementation -------------------------------------------- + // WebContentsView implementation -------------------------------------------- virtual void CreateView(const gfx::Size& initial_size) OVERRIDE; virtual RenderWidgetHostView* CreateViewForWidget( @@ -129,7 +129,7 @@ class CONTENT_EXPORT TabContentsViewGtk : public TabContentsView { // The TabContents whose contents we display. TabContents* tab_contents_; - // Common implementations of some TabContentsView methods. + // Common implementations of some WebContentsView methods. TabContentsViewHelper tab_contents_view_helper_; // This container holds the tab's web page views. It is a GtkExpandedContainer diff --git a/content/browser/tab_contents/tab_contents_view_helper.cc b/content/browser/tab_contents/tab_contents_view_helper.cc index 3d434d4..75896d3c 100644 --- a/content/browser/tab_contents/tab_contents_view_helper.cc +++ b/content/browser/tab_contents/tab_contents_view_helper.cc @@ -8,13 +8,13 @@ #include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/common/view_messages.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "content/public/browser/web_contents_view.h" using content::WebContents; @@ -58,7 +58,7 @@ TabContents* TabContentsViewHelper::CreateNewWindow( return NULL; // Create the new web contents. This will automatically create the new - // TabContentsView. In the future, we may want to create the view separately. + // WebContentsView. In the future, we may want to create the view separately. TabContents* new_contents = new TabContents(web_contents->GetBrowserContext(), web_contents->GetSiteInstance(), @@ -67,7 +67,7 @@ TabContents* TabContentsViewHelper::CreateNewWindow( NULL); new_contents->set_opener_web_ui_type( web_contents->GetWebUITypeForCurrentState()); - TabContentsView* new_view = new_contents->GetView(); + content::WebContentsView* new_view = new_contents->GetView(); // TODO(brettw): It seems bogus that we have to call this function on the // newly created object and give it one of its own member variables. diff --git a/content/browser/tab_contents/tab_contents_view_helper.h b/content/browser/tab_contents/tab_contents_view_helper.h index cf73b8b..b54d6bb 100644 --- a/content/browser/tab_contents/tab_contents_view_helper.h +++ b/content/browser/tab_contents/tab_contents_view_helper.h @@ -33,7 +33,7 @@ class Rect; // WebContentsImpl rather than WebContents. // Provides helper methods that provide common implementations of some -// TabContentsView methods. +// WebContentsView methods. class CONTENT_EXPORT TabContentsViewHelper : public content::NotificationObserver { public: diff --git a/content/browser/tab_contents/tab_contents_view_win.cc b/content/browser/tab_contents/tab_contents_view_win.cc index c70ea75..47814b0 100644 --- a/content/browser/tab_contents/tab_contents_view_win.cc +++ b/content/browser/tab_contents/tab_contents_view_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -165,7 +165,7 @@ void TabContentsViewWin::SetInitialFocus() { } void TabContentsViewWin::StoreFocus() { - // TODO(jam): why is this on TabContentsView? + // TODO(jam): why is this on WebContentsView? NOTREACHED(); } diff --git a/content/browser/tab_contents/tab_contents_view_win.h b/content/browser/tab_contents/tab_contents_view_win.h index ce994b8..d5161e3 100644 --- a/content/browser/tab_contents/tab_contents_view_win.h +++ b/content/browser/tab_contents/tab_contents_view_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,14 +6,14 @@ #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_ #pragma once -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/tab_contents/tab_contents_view_helper.h" +#include "content/public/browser/web_contents_view.h" #include "ui/base/win/window_impl.h" class RenderWidgetHostViewWin; -// An implementation of TabContentsView for Windows. -class TabContentsViewWin : public TabContentsView, +// An implementation of WebContentsView for Windows. +class TabContentsViewWin : public content::WebContentsView, public ui::WindowImpl { public: // TODO(jam): make this take a WebContents once it's created from content. @@ -26,7 +26,7 @@ class TabContentsViewWin : public TabContentsView, MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) END_MSG_MAP() - // Overridden from TabContentsView: + // Overridden from WebContentsView: virtual void CreateView(const gfx::Size& initial_size) OVERRIDE; virtual RenderWidgetHostView* CreateViewForWidget( RenderWidgetHost* render_widget_host) OVERRIDE; @@ -95,7 +95,7 @@ class TabContentsViewWin : public TabContentsView, RenderWidgetHostViewWin* view_; - // Common implementations of some TabContentsView methods. + // Common implementations of some WebContentsView methods. TabContentsViewHelper tab_contents_view_helper_; DISALLOW_COPY_AND_ASSIGN(TabContentsViewWin); diff --git a/content/browser/tab_contents/web_drag_source_gtk.cc b/content/browser/tab_contents/web_drag_source_gtk.cc index 20f4a1f..4b279b7 100644 --- a/content/browser/tab_contents/web_drag_source_gtk.cc +++ b/content/browser/tab_contents/web_drag_source_gtk.cc @@ -16,8 +16,8 @@ #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/tab_contents/drag_utils_gtk.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/browser/web_contents_view.h" #include "net/base/file_stream.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/content/browser/webui/web_ui.cc b/content/browser/webui/web_ui.cc index cfa743e..2ffd763 100644 --- a/content/browser/webui/web_ui.cc +++ b/content/browser/webui/web_ui.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,9 +13,9 @@ #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/webui/generic_handler.h" #include "content/common/view_messages.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui_controller.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/content_switches.h" diff --git a/content/content_browser.gypi b/content/content_browser.gypi index dd443fb..d1346c1 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -86,6 +86,7 @@ 'public/browser/web_contents_delegate.h', 'public/browser/web_contents_observer.cc', 'public/browser/web_contents_observer.h', + 'public/browser/web_contents_view.h', 'public/browser/web_intents_dispatcher.h', 'public/browser/web_ui.h', 'public/browser/web_ui_controller.cc', @@ -620,8 +621,6 @@ 'browser/tab_contents/render_view_host_manager.h', 'browser/tab_contents/tab_contents.cc', 'browser/tab_contents/tab_contents.h', - 'browser/tab_contents/tab_contents_view.cc', - 'browser/tab_contents/tab_contents_view.h', 'browser/tab_contents/tab_contents_view_gtk.cc', 'browser/tab_contents/tab_contents_view_gtk.h', 'browser/tab_contents/tab_contents_view_helper.cc', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 78e8a96..c486b1d 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -108,10 +108,10 @@ 'test/test_navigation_observer.h', 'test/test_notification_tracker.cc', 'test/test_notification_tracker.h', - 'test/test_tab_contents_view.cc', - 'test/test_tab_contents_view.h', 'test/test_url_fetcher_factory.cc', 'test/test_url_fetcher_factory.h', + 'test/test_web_contents_view.cc', + 'test/test_web_contents_view.h', 'test/unittest_test_suite.cc', 'test/unittest_test_suite.h', 'test/webrtc_audio_device_test.cc', @@ -438,7 +438,7 @@ '../third_party/angle/src/build_angle.gyp:libEGL', '../third_party/angle/src/build_angle.gyp:libGLESv2', '../media/media.gyp:media', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gfx/gl/gl.gyp:gl', ], 'conditions': [ ['win_use_allocator_shim==1', { @@ -446,9 +446,9 @@ '../base/allocator/allocator.gyp:allocator', ], }], - ], + ], }], - ], + ], 'defines!': ['CONTENT_IMPLEMENTATION'], 'type': 'executable', 'dependencies': [ diff --git a/content/public/browser/DEPS b/content/public/browser/DEPS index 753ae54..50130db 100644 --- a/content/public/browser/DEPS +++ b/content/public/browser/DEPS @@ -1,6 +1,10 @@ include_rules = [ "+content/browser/notification_service_impl.h", "+content/browser/renderer_host/render_view_host.h", + + # TODO(joi): Remove once render_view_host_delegate.h is moved. + "+content/browser/renderer_host/render_view_host_delegate.h", + # TODO(jam): remove "+content/browser/download/download_id.h", "+content/browser/download/download_state_info.h", diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index b806a1d..9151f87 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,8 +10,8 @@ #include <vector> #include "base/callback_forward.h" -#include "content/public/common/window_container_type.h" #include "content/public/common/content_client.h" +#include "content/public/common/window_container_type.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" class BrowserURLHandler; @@ -27,7 +27,6 @@ class SiteInstance; class SSLCertErrorHandler; class SSLClientAuthHandler; class SkBitmap; -class TabContentsView; class WorkerProcessHost; struct WebPreferences; @@ -36,6 +35,7 @@ class AccessTokenStore; class BrowserMainParts; class RenderProcessHost; class WebContents; +class WebContentsView; struct MainFunctionParams; struct ShowDesktopNotificationHostMsgParams; } @@ -85,7 +85,7 @@ class ContentBrowserClient { virtual BrowserMainParts* CreateBrowserMainParts( const content::MainFunctionParams& parameters) = 0; - virtual TabContentsView* CreateTabContentsView(WebContents* web_contents) = 0; + virtual WebContentsView* CreateWebContentsView(WebContents* web_contents) = 0; // Notifies that a new RenderHostView has been created. virtual void RenderViewHostCreated(RenderViewHost* render_view_host) = 0; diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h index 9f78e00..acb2623 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -22,9 +22,6 @@ class RenderViewHost; class RenderWidgetHostView; class SessionStorageNamespace; class SiteInstance; -// TODO(jam): of course we will have to rename TabContentsView etc to use -// WebContents. -class TabContentsView; namespace base { class PropertyBag; @@ -48,6 +45,9 @@ class RenderProcessHost; class WebContentsDelegate; struct RendererPreferences; struct SSLStatus; +// TODO(jam): of course we will have to rename WebContentsView etc to use +// WebContents. +class WebContentsView; // Describes what goes in the main content area of a tab. class WebContents : public PageNavigator { @@ -106,8 +106,8 @@ class WebContents : public PageNavigator { // time and can be NULL (during setup and teardown). virtual RenderWidgetHostView* GetRenderWidgetHostView() const = 0; - // The TabContentsView will never change and is guaranteed non-NULL. - virtual TabContentsView* GetView() const = 0; + // The WebContentsView will never change and is guaranteed non-NULL. + virtual WebContentsView* GetView() const = 0; // Create a WebUI page for the given url. In most cases, this doesn't need to // be called by embedders since content will create its own WebUI objects as @@ -304,7 +304,7 @@ class WebContents : public PageNavigator { // times, subsequent calls are ignored. virtual void OnCloseStarted() = 0; - // Returns true if underlying TabContentsView should accept drag-n-drop. + // Returns true if underlying WebContentsView should accept drag-n-drop. virtual bool ShouldAcceptDragAndDrop() const = 0; // A render view-originated drag has ended. Informs the render view host and diff --git a/content/browser/tab_contents/tab_contents_view.h b/content/public/browser/web_contents_view.h index 22f0321..0d9c564 100644 --- a/content/browser/tab_contents/tab_contents_view.h +++ b/content/public/browser/web_contents_view.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_ -#define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_ +#ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_VIEW_H_ +#define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_VIEW_H_ #pragma once #include <string> @@ -20,13 +20,16 @@ class RenderWidgetHost; class RenderWidgetHostView; class TabContents; -// The TabContentsView is an interface that is implemented by the platform- +namespace content { + +// The WebContentsView is an interface that is implemented by the platform- // dependent web contents views. The TabContents uses this interface to talk to // them. View-related messages will also get forwarded directly to this class // from RenderViewHost via RenderViewHostDelegate::View. -class CONTENT_EXPORT TabContentsView : public RenderViewHostDelegate::View { +class CONTENT_EXPORT WebContentsView : public RenderViewHostDelegate::View { public: - virtual ~TabContentsView(); + WebContentsView() {} + virtual ~WebContentsView() {} virtual void CreateView(const gfx::Size& initial_size) = 0; @@ -128,11 +131,10 @@ class CONTENT_EXPORT TabContentsView : public RenderViewHostDelegate::View { // Removes the native overlay view installed by |InstallOverlayView|. virtual void RemoveOverlayView() = 0; - protected: - TabContentsView(); // Abstract interface. - private: - DISALLOW_COPY_AND_ASSIGN(TabContentsView); + DISALLOW_COPY_AND_ASSIGN(WebContentsView); }; -#endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_ +} // namespace content + +#endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_VIEW_H_ diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc index 7a0dbfb..2e7d33e 100644 --- a/content/shell/shell_content_browser_client.cc +++ b/content/shell/shell_content_browser_client.cc @@ -34,7 +34,7 @@ BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts( return new ShellBrowserMainParts(parameters); } -TabContentsView* ShellContentBrowserClient::CreateTabContentsView( +WebContentsView* ShellContentBrowserClient::CreateWebContentsView( WebContents* web_contents) { #if defined(OS_WIN) return new TabContentsViewWin(web_contents); diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h index 347841a..4bf8c1b 100644 --- a/content/shell/shell_content_browser_client.h +++ b/content/shell/shell_content_browser_client.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -27,8 +27,8 @@ class ShellContentBrowserClient : public ContentBrowserClient { virtual BrowserMainParts* CreateBrowserMainParts( const content::MainFunctionParams& parameters) OVERRIDE; - virtual TabContentsView* CreateTabContentsView( - content::WebContents* web_contents) OVERRIDE; + virtual WebContentsView* CreateWebContentsView( + WebContents* web_contents) OVERRIDE; virtual void RenderViewHostCreated( RenderViewHost* render_view_host) OVERRIDE; virtual void RenderProcessHostCreated( diff --git a/content/test/test_tab_contents_view.cc b/content/test/test_tab_contents_view.cc deleted file mode 100644 index 25ddcec..0000000 --- a/content/test/test_tab_contents_view.cc +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "content/test/test_tab_contents_view.h" - -TestTabContentsView::TestTabContentsView() { -} - -TestTabContentsView::~TestTabContentsView() { -} - -void TestTabContentsView::CreateNewWindow( - int route_id, - const ViewHostMsg_CreateWindow_Params& params) { -} - -void TestTabContentsView::CreateNewWidget(int route_id, - WebKit::WebPopupType popup_type) { -} - -void TestTabContentsView::CreateNewFullscreenWidget(int route_id) { -} - -void TestTabContentsView::ShowCreatedWindow(int route_id, - WindowOpenDisposition disposition, - const gfx::Rect& initial_pos, - bool user_gesture) { -} - -void TestTabContentsView::ShowCreatedWidget(int route_id, - const gfx::Rect& initial_pos) { -} - -void TestTabContentsView::ShowCreatedFullscreenWidget(int route_id) { -} - -void TestTabContentsView::ShowContextMenu(const ContextMenuParams& params) { -} - -void TestTabContentsView::ShowPopupMenu(const gfx::Rect& bounds, - int item_height, - double item_font_size, - int selected_item, - const std::vector<WebMenuItem>& items, - bool right_aligned) { -} - -void TestTabContentsView::StartDragging( - const WebDropData& drop_data, - WebKit::WebDragOperationsMask allowed_ops, - const SkBitmap& image, - const gfx::Point& image_offset) { -} - -void TestTabContentsView::UpdateDragCursor(WebKit::WebDragOperation operation) { -} - -void TestTabContentsView::GotFocus() { -} - -void TestTabContentsView::TakeFocus(bool reverse) { -} - -void TestTabContentsView::CreateView(const gfx::Size& initial_size) { -} - -RenderWidgetHostView* TestTabContentsView::CreateViewForWidget( - RenderWidgetHost* render_widget_host) { - return NULL; -} - -gfx::NativeView TestTabContentsView::GetNativeView() const { - return gfx::NativeView(); -} - -gfx::NativeView TestTabContentsView::GetContentNativeView() const { - return gfx::NativeView(); -} - -gfx::NativeWindow TestTabContentsView::GetTopLevelNativeWindow() const { - return gfx::NativeWindow(); -} - -void TestTabContentsView::GetContainerBounds(gfx::Rect *out) const { -} - -void TestTabContentsView::SetPageTitle(const string16& title) { -} - -void TestTabContentsView::OnTabCrashed(base::TerminationStatus status, - int error_code) { -} - -void TestTabContentsView::SizeContents(const gfx::Size& size) { -} - -void TestTabContentsView::RenderViewCreated(RenderViewHost* host) { -} - -void TestTabContentsView::Focus() { -} - -void TestTabContentsView::SetInitialFocus() { -} - -void TestTabContentsView::StoreFocus() { -} - -void TestTabContentsView::RestoreFocus() { -} - -bool TestTabContentsView::IsDoingDrag() const { - return false; -} - -void TestTabContentsView::CancelDragAndCloseTab() { -} - -bool TestTabContentsView::IsEventTracking() const { - return false; -} - -void TestTabContentsView::CloseTabAfterEventTracking() { -} - -void TestTabContentsView::GetViewBounds(gfx::Rect* out) const { -} - -void TestTabContentsView::InstallOverlayView(gfx::NativeView view) { -} - -void TestTabContentsView::RemoveOverlayView() { -} diff --git a/content/test/test_web_contents_view.cc b/content/test/test_web_contents_view.cc new file mode 100644 index 0000000..20da30c --- /dev/null +++ b/content/test/test_web_contents_view.cc @@ -0,0 +1,138 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/test/test_web_contents_view.h" + +namespace content { + +TestWebContentsView::TestWebContentsView() { +} + +TestWebContentsView::~TestWebContentsView() { +} + +void TestWebContentsView::CreateNewWindow( + int route_id, + const ViewHostMsg_CreateWindow_Params& params) { +} + +void TestWebContentsView::CreateNewWidget(int route_id, + WebKit::WebPopupType popup_type) { +} + +void TestWebContentsView::CreateNewFullscreenWidget(int route_id) { +} + +void TestWebContentsView::ShowCreatedWindow(int route_id, + WindowOpenDisposition disposition, + const gfx::Rect& initial_pos, + bool user_gesture) { +} + +void TestWebContentsView::ShowCreatedWidget(int route_id, + const gfx::Rect& initial_pos) { +} + +void TestWebContentsView::ShowCreatedFullscreenWidget(int route_id) { +} + +void TestWebContentsView::ShowContextMenu(const ContextMenuParams& params) { +} + +void TestWebContentsView::ShowPopupMenu(const gfx::Rect& bounds, + int item_height, + double item_font_size, + int selected_item, + const std::vector<WebMenuItem>& items, + bool right_aligned) { +} + +void TestWebContentsView::StartDragging( + const WebDropData& drop_data, + WebKit::WebDragOperationsMask allowed_ops, + const SkBitmap& image, + const gfx::Point& image_offset) { +} + +void TestWebContentsView::UpdateDragCursor(WebKit::WebDragOperation operation) { +} + +void TestWebContentsView::GotFocus() { +} + +void TestWebContentsView::TakeFocus(bool reverse) { +} + +void TestWebContentsView::CreateView(const gfx::Size& initial_size) { +} + +RenderWidgetHostView* TestWebContentsView::CreateViewForWidget( + RenderWidgetHost* render_widget_host) { + return NULL; +} + +gfx::NativeView TestWebContentsView::GetNativeView() const { + return gfx::NativeView(); +} + +gfx::NativeView TestWebContentsView::GetContentNativeView() const { + return gfx::NativeView(); +} + +gfx::NativeWindow TestWebContentsView::GetTopLevelNativeWindow() const { + return gfx::NativeWindow(); +} + +void TestWebContentsView::GetContainerBounds(gfx::Rect *out) const { +} + +void TestWebContentsView::SetPageTitle(const string16& title) { +} + +void TestWebContentsView::OnTabCrashed(base::TerminationStatus status, + int error_code) { +} + +void TestWebContentsView::SizeContents(const gfx::Size& size) { +} + +void TestWebContentsView::RenderViewCreated(RenderViewHost* host) { +} + +void TestWebContentsView::Focus() { +} + +void TestWebContentsView::SetInitialFocus() { +} + +void TestWebContentsView::StoreFocus() { +} + +void TestWebContentsView::RestoreFocus() { +} + +bool TestWebContentsView::IsDoingDrag() const { + return false; +} + +void TestWebContentsView::CancelDragAndCloseTab() { +} + +bool TestWebContentsView::IsEventTracking() const { + return false; +} + +void TestWebContentsView::CloseTabAfterEventTracking() { +} + +void TestWebContentsView::GetViewBounds(gfx::Rect* out) const { +} + +void TestWebContentsView::InstallOverlayView(gfx::NativeView view) { +} + +void TestWebContentsView::RemoveOverlayView() { +} + +} // namespace content diff --git a/content/test/test_tab_contents_view.h b/content/test/test_web_contents_view.h index 04c1b10..5d07c3a 100644 --- a/content/test/test_tab_contents_view.h +++ b/content/test/test_web_contents_view.h @@ -1,18 +1,20 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_TEST_TEST_TAB_CONTENTS_VIEW_H_ -#define CONTENT_TEST_TEST_TAB_CONTENTS_VIEW_H_ +#ifndef CONTENT_TEST_TEST_WEB_CONTENTS_VIEW_H_ +#define CONTENT_TEST_TEST_WEB_CONTENTS_VIEW_H_ #pragma once #include "base/compiler_specific.h" -#include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/web_contents_view.h" -class TestTabContentsView : public TabContentsView { +namespace content { + +class TestWebContentsView : public WebContentsView { public: - TestTabContentsView(); - virtual ~TestTabContentsView(); + TestWebContentsView(); + virtual ~TestWebContentsView(); // RenderViewHostDelegate::View: virtual void CreateNewWindow( @@ -43,7 +45,7 @@ class TestTabContentsView : public TabContentsView { virtual void GotFocus() OVERRIDE; virtual void TakeFocus(bool reverse) OVERRIDE; - // TabContentsView: + // WebContentsView: virtual void CreateView(const gfx::Size& initial_size) OVERRIDE; virtual RenderWidgetHostView* CreateViewForWidget( RenderWidgetHost* render_widget_host) OVERRIDE; @@ -69,7 +71,9 @@ class TestTabContentsView : public TabContentsView { virtual void RemoveOverlayView() OVERRIDE; private: - DISALLOW_COPY_AND_ASSIGN(TestTabContentsView); + DISALLOW_COPY_AND_ASSIGN(TestWebContentsView); }; -#endif // CONTENT_TEST_TEST_TAB_CONTENTS_VIEW_H_ +} // namespace content + +#endif // CONTENT_TEST_TEST_WEB_CONTENTS_VIEW_H_ |