summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-09 21:34:25 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-09 21:34:25 +0000
commit5ac950bb1af4dba863e3616a6af8f5ed6a935981 (patch)
treef7c12a16dbab1b6d45d606026fb0625183d8bde7 /chrome/browser/chromeos
parentd04adb7c0dab3f8b3ade909b33ae8e9175b80f83 (diff)
downloadchromium_src-5ac950bb1af4dba863e3616a6af8f5ed6a935981.zip
chromium_src-5ac950bb1af4dba863e3616a6af8f5ed6a935981.tar.gz
chromium_src-5ac950bb1af4dba863e3616a6af8f5ed6a935981.tar.bz2
Cleanup: Remove unneeded includes of tab_contents.h.
BUG=none TEST=none Review URL: http://codereview.chromium.org/5629007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/dom_ui/imageburner_ui.cc3
-rw-r--r--chrome/browser/chromeos/dom_ui/imageburner_ui.h3
-rw-r--r--chrome/browser/chromeos/dom_ui/internet_options_handler.cc2
-rw-r--r--chrome/browser/chromeos/login/background_view.cc6
-rw-r--r--chrome/browser/chromeos/panels/panel_browsertest.cc3
-rw-r--r--chrome/browser/chromeos/update_browsertest.cc2
6 files changed, 7 insertions, 12 deletions
diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc
index 75d8b40..24fc64a 100644
--- a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/chromeos/dom_ui/imageburner_ui.h"
+#include <algorithm>
+
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/i18n/rtl.h"
@@ -18,6 +20,7 @@
#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"
diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.h b/chrome/browser/chromeos/dom_ui/imageburner_ui.h
index 5803762..44041e5 100644
--- a/chrome/browser/chromeos/dom_ui/imageburner_ui.h
+++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.h
@@ -22,7 +22,6 @@
#include "chrome/browser/download/download_item.h"
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/download/download_util.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "googleurl/src/gurl.h"
#include "net/base/file_stream.h"
@@ -38,6 +37,7 @@ static const std::string kImageFileName = "chromeos_image.bin.gz";
static const std::string kTempImageFolderName = "chromeos_image";
class ImageBurnResourceManager;
+class TabContents;
class ImageBurnUIHTMLSource : public ChromeURLDataManager::DataSource {
public:
@@ -223,4 +223,3 @@ class ImageBurnUI : public DOMUI {
DISALLOW_COPY_AND_ASSIGN(ImageBurnUI);
};
#endif // CHROME_BROWSER_CHROMEOS_DOM_UI_IMAGEBURNER_UI_H_
-
diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
index 1d0b50b..635cf4a 100644
--- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
@@ -26,8 +26,6 @@
#include "chrome/browser/chromeos/login/ownership_service.h"
#include "chrome/browser/chromeos/status/network_menu.h"
#include "chrome/browser/dom_ui/dom_ui_util.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/views/window.h"
#include "chrome/common/notification_service.h"
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index d6dfe78a..f3cad34 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -6,6 +6,7 @@
#include <string>
#include <vector>
+
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "app/x11_util.h"
@@ -25,7 +26,6 @@
#include "chrome/browser/chromeos/status/status_area_view.h"
#include "chrome/browser/chromeos/wm_ipc.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/views/dom_view.h"
#include "cros/chromeos_wm_ipc_enums.h"
#include "googleurl/src/gurl.h"
@@ -40,8 +40,8 @@
// X Windows headers have "#define Status int". That interferes with
// NetworkLibrary header which defines enum "Status".
-#include <X11/cursorfont.h>
-#include <X11/Xcursor/Xcursor.h>
+#include <X11/cursorfont.h> // NOLINT
+#include <X11/Xcursor/Xcursor.h> // NOLINT
using views::WidgetGtk;
diff --git a/chrome/browser/chromeos/panels/panel_browsertest.cc b/chrome/browser/chromeos/panels/panel_browsertest.cc
index f655369..74f2a54 100644
--- a/chrome/browser/chromeos/panels/panel_browsertest.cc
+++ b/chrome/browser/chromeos/panels/panel_browsertest.cc
@@ -4,11 +4,9 @@
#include "base/command_line.h"
#include "chrome/browser/browser_list.h"
-#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/chromeos/wm_ipc.h"
#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/in_process_browser_test.h"
@@ -27,7 +25,6 @@ class PanelTest : public InProcessBrowserTest {
virtual void SetUpCommandLine(CommandLine* command_line) {
command_line->AppendSwitch(switches::kDisablePopupBlocking);
}
-
};
// Small popups should open as a panel.
diff --git a/chrome/browser/chromeos/update_browsertest.cc b/chrome/browser/chromeos/update_browsertest.cc
index 2c0798d..1129e12 100644
--- a/chrome/browser/chromeos/update_browsertest.cc
+++ b/chrome/browser/chromeos/update_browsertest.cc
@@ -7,7 +7,6 @@
#include "chrome/browser/browser_list.h"
#include "chrome/browser/chromeos/cros/mock_update_library.h"
#include "chrome/browser/chromeos/update_observer.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/automation/dom_element_proxy.h"
@@ -118,4 +117,3 @@ IN_PROC_BROWSER_TEST_F(UpdateBrowserTest, Notifications) {
}
} // namespace
-