summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 16:45:42 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 16:45:42 +0000
commit21f1168bab8f4ac626011148ae6e65d8fd24272a (patch)
tree4db51958027594c9cf0382d204e767c1dbfd84c6 /chrome/browser/chromeos
parent773a814f5cedef18ac3c5d775bca663190d2ae0f (diff)
downloadchromium_src-21f1168bab8f4ac626011148ae6e65d8fd24272a.zip
chromium_src-21f1168bab8f4ac626011148ae6e65d8fd24272a.tar.gz
chromium_src-21f1168bab8f4ac626011148ae6e65d8fd24272a.tar.bz2
Update the includes to the old tab_contents.h
TBR=avi Review URL: http://codereview.chromium.org/6596103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76552 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/locale_change_guard.cc2
-rw-r--r--chrome/browser/chromeos/login/web_page_view.h2
-rw-r--r--chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc2
-rw-r--r--chrome/browser/chromeos/usb_mount_observer.cc2
-rw-r--r--chrome/browser/chromeos/webui/cros_language_options_handler.cc2
-rw-r--r--chrome/browser/chromeos/webui/imageburner_ui.cc2
-rw-r--r--chrome/browser/chromeos/webui/mobile_setup_ui.cc2
-rw-r--r--chrome/browser/chromeos/webui/wrench_menu_ui.cc2
8 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc
index e12d8d3..d65c6cf 100644
--- a/chrome/browser/chromeos/locale_change_guard.cc
+++ b/chrome/browser/chromeos/locale_change_guard.cc
@@ -11,9 +11,9 @@
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/notifications/notification_delegate.h"
#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/pref_names.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "grit/app_resources.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/chromeos/login/web_page_view.h b/chrome/browser/chromeos/login/web_page_view.h
index dc1bdb8..b6fc966 100644
--- a/chrome/browser/chromeos/login/web_page_view.h
+++ b/chrome/browser/chromeos/login/web_page_view.h
@@ -9,8 +9,8 @@
#include <string>
#include "base/timer.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/views/dom_view.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "views/view.h"
class Profile;
diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc b/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc
index 4fb4552..063f8a9 100644
--- a/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc
+++ b/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc
@@ -8,7 +8,6 @@
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
@@ -16,6 +15,7 @@
#include "chrome/common/url_constants.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "googleurl/src/gurl.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/usb_mount_observer.cc b/chrome/browser/chromeos/usb_mount_observer.cc
index d715379..bfa58ad 100644
--- a/chrome/browser/chromeos/usb_mount_observer.cc
+++ b/chrome/browser/chromeos/usb_mount_observer.cc
@@ -7,13 +7,13 @@
#include "base/command_line.h"
#include "base/singleton.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/webui/filebrowse_ui.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
+#include "content/browser/tab_contents/tab_contents.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/webui/cros_language_options_handler.cc b/chrome/browser/chromeos/webui/cros_language_options_handler.cc
index 027ec16..5ea1cba 100644
--- a/chrome/browser/chromeos/webui/cros_language_options_handler.cc
+++ b/chrome/browser/chromeos/webui/cros_language_options_handler.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/chromeos/webui/imageburner_ui.cc b/chrome/browser/chromeos/webui/imageburner_ui.cc
index 56b4271..33e79e1 100644
--- a/chrome/browser/chromeos/webui/imageburner_ui.cc
+++ b/chrome/browser/chromeos/webui/imageburner_ui.cc
@@ -17,11 +17,11 @@
#include "chrome/browser/download/download_types.h"
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/url_constants.h"
#include "content/browser/browser_thread.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "grit/browser_resources.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
diff --git a/chrome/browser/chromeos/webui/mobile_setup_ui.cc b/chrome/browser/chromeos/webui/mobile_setup_ui.cc
index b9b1989..cd90494 100644
--- a/chrome/browser/chromeos/webui/mobile_setup_ui.cc
+++ b/chrome/browser/chromeos/webui/mobile_setup_ui.cc
@@ -27,12 +27,12 @@
#include "chrome/browser/chromeos/cros/system_library.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "content/browser/browser_thread.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "googleurl/src/gurl.h"
#include "grit/browser_resources.h"
#include "grit/chromium_strings.h"
diff --git a/chrome/browser/chromeos/webui/wrench_menu_ui.cc b/chrome/browser/chromeos/webui/wrench_menu_ui.cc
index 0d9d6d3..213a44b 100644
--- a/chrome/browser/chromeos/webui/wrench_menu_ui.cc
+++ b/chrome/browser/chromeos/webui/wrench_menu_ui.cc
@@ -13,11 +13,11 @@
#include "chrome/browser/browser_list.h"
#include "chrome/browser/chromeos/views/native_menu_webui.h"
#include "chrome/browser/chromeos/views/webui_menu_widget.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/notification_registrar.h"
#include "chrome/common/notification_source.h"
#include "chrome/common/url_constants.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "googleurl/src/gurl.h"
#include "grit/browser_resources.h"
#include "grit/generated_resources.h"