summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 20:26:10 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 20:26:10 +0000
commit8643e6d85c2a41d6497d5cb9b69bea9465102e96 (patch)
tree59f2ce5b54122410f6200f69bbb3144d19ed02bd /chrome/browser/chromeos
parent16128cf279e5523eac781a97600ef7d9773aa2c5 (diff)
downloadchromium_src-8643e6d85c2a41d6497d5cb9b69bea9465102e96.zip
chromium_src-8643e6d85c2a41d6497d5cb9b69bea9465102e96.tar.gz
chromium_src-8643e6d85c2a41d6497d5cb9b69bea9465102e96.tar.bz2
Rename TabContentsView to WebContentsView and move to content/public.
Also rename TestTabContentsView to TestWebContentsView. Add content namespace to both. TBR=owners (trivial updates) BUG=98716 Review URL: http://codereview.chromium.org/9241011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/external_protocol_dialog.cc2
-rw-r--r--chrome/browser/chromeos/offline/offline_load_page_unittest.cc2
-rw-r--r--chrome/browser/chromeos/tab_closeable_state_watcher.cc4
3 files changed, 4 insertions, 4 deletions
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 {