summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-04 07:58:34 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-04 07:58:34 +0000
commit57c6a6579cf274fe37d6196931a3034d90da7113 (patch)
treeec42313580156ccc039b5fee714ee12259cb08ee /chrome/browser/extensions
parentb23c9e1f05d474adc327c85d87eacc77554976e0 (diff)
downloadchromium_src-57c6a6579cf274fe37d6196931a3034d90da7113.zip
chromium_src-57c6a6579cf274fe37d6196931a3034d90da7113.tar.gz
chromium_src-57c6a6579cf274fe37d6196931a3034d90da7113.tar.bz2
Replace all occurrances of WebContents with TabContents.
Review URL: http://codereview.chromium.org/99177 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rwxr-xr-xchrome/browser/extensions/extension_host.cc6
-rwxr-xr-xchrome/browser/extensions/extension_host.h2
-rwxr-xr-xchrome/browser/extensions/extension_message_service.cc4
-rw-r--r--chrome/browser/extensions/extensions_ui.cc2
-rw-r--r--chrome/browser/extensions/extensions_ui.h2
5 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 509810b..8cfec94 100755
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/renderer_host/render_widget_host.h"
#include "chrome/browser/renderer_host/render_widget_host_view.h"
#include "chrome/browser/tab_contents/site_instance.h"
-#include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
@@ -105,7 +105,7 @@ RenderViewHostDelegate::View* ExtensionHost::GetViewDelegate() const {
// must be const (no good reason for it as far as I can tell) which means you
// can't return self without doing this const_cast. Either we need to change
// the interface, or we need to split out the view delegate into another
- // object (which is how WebContents works).
+ // object (which is how TabContents works).
return const_cast<ExtensionHost*>(this);
}
@@ -125,7 +125,7 @@ void ExtensionHost::ShowCreatedWindow(int route_id,
WindowOpenDisposition disposition,
const gfx::Rect& initial_pos,
bool user_gesture) {
- WebContents* contents = delegate_view_helper_.GetCreatedWindow(route_id);
+ TabContents* contents = delegate_view_helper_.GetCreatedWindow(route_id);
if (contents) {
// TODO(erikkay) is it safe to pass in NULL as source?
GetBrowser()->AddTabContents(contents, disposition, initial_pos,
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index d393881..9e90522 100755
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -13,7 +13,7 @@ class Extension;
class ExtensionView;
class RenderWidgetHost;
class RenderWidgetHostView;
-class WebContents;
+class TabContents;
struct WebPreferences;
// This class is the browser component of an extension component's RenderView.
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index 95dd221..afac5c9 100755
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -14,8 +14,8 @@
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/resource_message_filter.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/tab_contents/web_contents.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/stl_util-inl.h"
@@ -163,7 +163,7 @@ void ExtensionMessageService::OpenChannelOnUIThread(
channels_[GET_CHANNEL_ID(source_port_id)] = channel;
std::string tab_json = "null";
- WebContents* contents = tab_util::GetWebContentsByID(source_process_id,
+ TabContents* contents = tab_util::GetTabContentsByID(source_process_id,
source_routing_id);
if (contents) {
DictionaryValue* tab_value = ExtensionTabUtil::CreateTabValue(contents);
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 64a68f7..c73bdc6 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -170,7 +170,7 @@ ExtensionsDOMHandler::~ExtensionsDOMHandler() {
void ExtensionsDOMHandler::Init() {
}
-ExtensionsUI::ExtensionsUI(WebContents* contents) : DOMUI(contents) {
+ExtensionsUI::ExtensionsUI(TabContents* contents) : DOMUI(contents) {
ExtensionsService *exstension_service = GetProfile()->GetExtensionsService();
ExtensionsDOMHandler* handler = new ExtensionsDOMHandler(this,
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index 56bd08a..3d1ed7b 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -60,7 +60,7 @@ class ExtensionsDOMHandler : public DOMMessageHandler {
class ExtensionsUI : public DOMUI {
public:
- explicit ExtensionsUI(WebContents* contents);
+ explicit ExtensionsUI(TabContents* contents);
private:
DISALLOW_COPY_AND_ASSIGN(ExtensionsUI);