diff options
Diffstat (limited to 'chrome/browser/ui')
83 files changed, 159 insertions, 6 deletions
diff --git a/chrome/browser/ui/auto_login_prompter.cc b/chrome/browser/ui/auto_login_prompter.cc index 6d1aa8d..d031587 100644 --- a/chrome/browser/ui/auto_login_prompter.cc +++ b/chrome/browser/ui/auto_login_prompter.cc @@ -39,6 +39,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +using content::BrowserThread; + // AutoLoginRedirector -------------------------------------------------------- // This class is created by the AutoLoginInfoBarDelegate when the user wishes to diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc index be7386c..f3a3dfe 100644 --- a/chrome/browser/ui/browser_close_browsertest.cc +++ b/chrome/browser/ui/browser_close_browsertest.cc @@ -27,6 +27,8 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/public/common/page_transition_types.h" +using content::BrowserThread; + class BrowserCloseTest : public InProcessBrowserTest { public: // Structure defining test cases for DownloadsCloseCheck. diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 7aad216..7fa60491 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -111,6 +111,8 @@ #include "ui/base/touch/touch_factory.h" #endif +using content::BrowserThread; + namespace { // SetAsDefaultBrowserTask ---------------------------------------------------- diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm index 46f85d5..a0f07e0 100644 --- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm +++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm @@ -8,6 +8,8 @@ #include "chrome/test/base/testing_browser_process.h" #include "content/test/test_browser_thread.h" +using content::BrowserThread; + CocoaProfileTest::CocoaProfileTest() : ui_thread_(BrowserThread::UI, &message_loop_), profile_manager_(static_cast<TestingBrowserProcess*>(g_browser_process)), diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm index e5aa259..a57e2fb 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm @@ -13,6 +13,8 @@ #include "content/test/test_browser_thread.h" #include "chrome/test/base/testing_profile.h" +using content::BrowserThread; + namespace { class CollectedCookiesWindowControllerTest diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm index 6a5fb86..d643c2e 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm @@ -17,6 +17,8 @@ #include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + namespace { class DummyContentSettingBubbleModel : public ContentSettingBubbleModel { diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index 9a9f324..f20ae1a 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -28,6 +28,7 @@ #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; // C++ class that receives EXTENSION_LOADED notifications and proxies them back // to |controller|. diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm index 1461429..8f3edcf 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm @@ -14,6 +14,8 @@ #include "chrome/test/base/testing_profile.h" #include "content/test/test_browser_thread.h" +using content::BrowserThread; + // Subclass balloon controller and mock out the initialization of the RVH. @interface TestBalloonController : BalloonController { } diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm index cb44475..7c892ef 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm @@ -23,6 +23,8 @@ #include "net/base/x509_certificate.h" #include "ui/base/l10n/l10n_util_mac.h" +using content::BrowserThread; + @interface SFChooseIdentityPanel (SystemPrivate) // A system-private interface that dismisses a panel whose sheet was started by // beginSheetForWindow:modalDelegate:didEndSelector:contextInfo:identities:message: diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index 3a75527..9b6e800 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -41,6 +41,8 @@ #include "ui/gfx/image/image.h" #include "ui/gfx/scoped_cg_context_save_gstate_mac.h" +using content::BrowserThread; + // Height of the bottom gradient, in pixels. const CGFloat kBottomGradientHeight = 50; diff --git a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc index 9e64185..89afe13 100644 --- a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc +++ b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc @@ -9,6 +9,8 @@ #include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + class ConstrainedWindowTabHelperUnit : public TabContentsWrapperTestHarness { public: ConstrainedWindowTabHelperUnit() diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index 33ce546..8945051 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc @@ -16,6 +16,8 @@ #include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + class ContentSettingBubbleModelTest : public TabContentsWrapperTestHarness { protected: ContentSettingBubbleModelTest() diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc index 2709148..4516454 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc @@ -16,6 +16,8 @@ #include "net/base/cookie_options.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + class ContentSettingImageModelTest : public TabContentsWrapperTestHarness { public: ContentSettingImageModelTest() diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.cc b/chrome/browser/ui/crypto_module_password_dialog_nss.cc index 6c4bf5a..3b699e5 100644 --- a/chrome/browser/ui/crypto_module_password_dialog_nss.cc +++ b/chrome/browser/ui/crypto_module_password_dialog_nss.cc @@ -16,6 +16,8 @@ #include "crypto/nss_util.h" #endif +using content::BrowserThread; + namespace { bool ShouldShowDialog(const net::CryptoModule* module) { diff --git a/chrome/browser/ui/find_bar/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc index a5b0fd7..c1f4ceb 100644 --- a/chrome/browser/ui/find_bar/find_backend_unittest.cc +++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc @@ -14,6 +14,8 @@ #include "content/browser/tab_contents/test_tab_contents.h" #include "content/test/test_browser_thread.h" +using content::BrowserThread; + class FindBackendTest : public TabContentsWrapperTestHarness { public: FindBackendTest() diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc index 1567f93..a48f587 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc @@ -13,6 +13,8 @@ #include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + // Dummy implementation that's good enough for the tests; we don't test // rendering here so all we need is a non-NULL object. class EmptyTabstripOriginProvider : public TabstripOriginProvider { diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc index 8316d3d..999e242 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc @@ -18,6 +18,7 @@ using base::Time; using base::TimeDelta; using bookmark_utils::GetTitleFromTreeIter; +using content::BrowserThread; // Base class for bookmark editor tests. This class is a copy from // bookmark_editor_view_unittest.cc, and all the tests in this file are diff --git a/chrome/browser/ui/gtk/certificate_dialogs.cc b/chrome/browser/ui/gtk/certificate_dialogs.cc index 0b2aa84..0dd9fa4 100644 --- a/chrome/browser/ui/gtk/certificate_dialogs.cc +++ b/chrome/browser/ui/gtk/certificate_dialogs.cc @@ -19,6 +19,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; + namespace { //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc index 56a5a85..ac57be3 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.cc +++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc @@ -24,6 +24,8 @@ #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" #endif +using content::BrowserThread; + ConstrainedWindowGtkDelegate::~ConstrainedWindowGtkDelegate() { } diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc index a1dbe87..6518d2c 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc @@ -27,6 +27,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/gtk_util.h" +using content::BrowserThread; + namespace { // Size (in pixels) of the icon preview. diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h index 12eaffc..3ac796b 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h @@ -14,6 +14,8 @@ #include "googleurl/src/gurl.h" #include "ui/base/gtk/gtk_signal.h" +using content::BrowserThread; + typedef struct _GdkPixbuf GdkPixbuf; typedef struct _GtkWidget GtkWidget; typedef struct _GtkWindow GtkWindow; diff --git a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc index bdfe27a..e17522a 100644 --- a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc +++ b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc @@ -19,6 +19,8 @@ #include "ui/base/gtk/gtk_signal.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; + namespace { class CryptoModuleBlockingDialogDelegate diff --git a/chrome/browser/ui/gtk/dialogs_common.cc b/chrome/browser/ui/gtk/dialogs_common.cc index f792f0c..5f73a00 100644 --- a/chrome/browser/ui/gtk/dialogs_common.cc +++ b/chrome/browser/ui/gtk/dialogs_common.cc @@ -14,6 +14,8 @@ #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_thread.h" +using content::BrowserThread; + FilePath* SelectFileDialogImpl::last_saved_path_ = NULL; FilePath* SelectFileDialogImpl::last_opened_path_ = NULL; diff --git a/chrome/browser/ui/gtk/dialogs_kde.cc b/chrome/browser/ui/gtk/dialogs_kde.cc index 9781df8..5cb98de 100644 --- a/chrome/browser/ui/gtk/dialogs_kde.cc +++ b/chrome/browser/ui/gtk/dialogs_kde.cc @@ -27,6 +27,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; + // Implementation of SelectFileDialog that shows a KDE common dialog for // choosing a file or folder. This acts as a modal dialog. class SelectFileDialogImplKDE : public SelectFileDialogImpl { diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc index 8a07c1c..3897caa 100644 --- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc @@ -30,6 +30,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/native_widget_types.h" +using content::BrowserThread; + namespace { enum { diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc index 33d9676..e191f50 100644 --- a/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc +++ b/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc @@ -27,6 +27,7 @@ #include "ui/gfx/codec/png_codec.h" #include "webkit/glue/web_intent_service_data.h" +using content::BrowserThread; using testing::_; using testing::AtMost; using testing::DoAll; diff --git a/chrome/browser/ui/intents/web_intents_model_unittest.cc b/chrome/browser/ui/intents/web_intents_model_unittest.cc index 5ada7f5..c42da98 100644 --- a/chrome/browser/ui/intents/web_intents_model_unittest.cc +++ b/chrome/browser/ui/intents/web_intents_model_unittest.cc @@ -14,6 +14,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/tree_node_model.h" +using content::BrowserThread; + class WebIntentsModelTest : public testing::Test { public: WebIntentsModelTest() diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index 36d3efd..6a459d8 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -29,6 +29,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/text_elider.h" +using content::BrowserThread; using webkit_glue::PasswordForm; class LoginHandlerImpl; diff --git a/chrome/browser/ui/login/login_prompt_gtk.cc b/chrome/browser/ui/login/login_prompt_gtk.cc index 744c31a..1070117 100644 --- a/chrome/browser/ui/login/login_prompt_gtk.cc +++ b/chrome/browser/ui/login/login_prompt_gtk.cc @@ -26,6 +26,7 @@ #include "ui/base/gtk/gtk_signal.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; using webkit_glue::PasswordForm; // ---------------------------------------------------------------------------- diff --git a/chrome/browser/ui/login/login_prompt_mac.mm b/chrome/browser/ui/login/login_prompt_mac.mm index 2c5c2ad..34c4275 100644 --- a/chrome/browser/ui/login/login_prompt_mac.mm +++ b/chrome/browser/ui/login/login_prompt_mac.mm @@ -24,6 +24,7 @@ #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; using webkit_glue::PasswordForm; // ---------------------------------------------------------------------------- diff --git a/chrome/browser/ui/login/login_prompt_ui.cc b/chrome/browser/ui/login/login_prompt_ui.cc index 28dfcc8..b938b49f 100644 --- a/chrome/browser/ui/login/login_prompt_ui.cc +++ b/chrome/browser/ui/login/login_prompt_ui.cc @@ -26,6 +26,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/size.h" +using content::BrowserThread; + class LoginHandlerSource : public ChromeURLDataManager::DataSource { public: LoginHandlerSource() diff --git a/chrome/browser/ui/login/login_prompt_win.cc b/chrome/browser/ui/login/login_prompt_win.cc index bd69bb8..0d1c9a2 100644 --- a/chrome/browser/ui/login/login_prompt_win.cc +++ b/chrome/browser/ui/login/login_prompt_win.cc @@ -21,6 +21,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/window/dialog_delegate.h" +using content::BrowserThread; using webkit_glue::PasswordForm; // ---------------------------------------------------------------------------- diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc index 602e6fa..a381cda 100644 --- a/chrome/browser/ui/panels/panel_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browsertest.cc @@ -30,6 +30,8 @@ #include "content/public/common/url_constants.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + class PanelBrowserTest : public BasePanelBrowserTest { public: PanelBrowserTest() : BasePanelBrowserTest() { diff --git a/chrome/browser/ui/shell_dialogs_unittest.cc b/chrome/browser/ui/shell_dialogs_unittest.cc index 0344dfc..8245699 100644 --- a/chrome/browser/ui/shell_dialogs_unittest.cc +++ b/chrome/browser/ui/shell_dialogs_unittest.cc @@ -17,6 +17,8 @@ #include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + class FileSelectionUser : public SelectFileDialog::Listener { public: FileSelectionUser() diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc index 7011399..31a9f3a 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc @@ -22,6 +22,8 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" +using content::BrowserThread; + namespace { // Creates a bitmap of the specified color. diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc index f521b17..7be469d 100644 --- a/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc +++ b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc @@ -15,6 +15,8 @@ #include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + class EncodingMenuControllerTest : public testing::Test { public: EncodingMenuControllerTest() diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 0bf9d01..9dfc225 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -36,6 +36,8 @@ #include "views/views_delegate.h" #include "views/widget/widget.h" +using content::BrowserThread; + #if defined(OS_LINUX) // See http://crbug.com/40040 for details. #define MAYBE_DND DISABLED_DND diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc index c9c842b..0e317f9 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc @@ -23,6 +23,8 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #endif +using content::BrowserThread; + namespace { // PageNavigator implementation that records the URL. diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc index 5a0299b..6907a8b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc @@ -16,6 +16,7 @@ using base::Time; using base::TimeDelta; +using content::BrowserThread; // Base class for bookmark editor tests. Creates a BookmarkModel and populates // it with test data. diff --git a/chrome/browser/ui/views/file_manager_dialog.cc b/chrome/browser/ui/views/file_manager_dialog.cc index 0d040f1..7e2aa57 100644 --- a/chrome/browser/ui/views/file_manager_dialog.cc +++ b/chrome/browser/ui/views/file_manager_dialog.cc @@ -20,6 +20,8 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/browser_thread.h" +using content::BrowserThread; + namespace { const int kFileManagerWidth = 720; // pixels diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc index 80da6ef..288d2ed 100644 --- a/chrome/browser/ui/views/select_file_dialog.cc +++ b/chrome/browser/ui/views/select_file_dialog.cc @@ -25,6 +25,8 @@ #include "ui/base/l10n/l10n_util.h" #include "views/window/non_client_view.h" +using content::BrowserThread; + namespace { const char kKeyNamePath[] = "path"; diff --git a/chrome/browser/ui/views/shell_dialogs_aura.cc b/chrome/browser/ui/views/shell_dialogs_aura.cc index 365fb4b..a0753ee 100644 --- a/chrome/browser/ui/views/shell_dialogs_aura.cc +++ b/chrome/browser/ui/views/shell_dialogs_aura.cc @@ -7,6 +7,8 @@ #include "chrome/browser/ui/views/file_manager_dialog.h" #include "content/public/browser/browser_thread.h" +using content::BrowserThread; + // static SelectFileDialog* SelectFileDialog::Create(Listener* listener) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc index 1ddb1dd..faa4cb9 100644 --- a/chrome/browser/ui/views/shell_dialogs_win.cc +++ b/chrome/browser/ui/views/shell_dialogs_win.cc @@ -27,6 +27,8 @@ #include "grit/ui_strings.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; + // This function takes the output of a SaveAs dialog: a filename, a filter and // the extension originally suggested to the user (shown in the dialog box) and // returns back the filename with the appropriate extension tacked on. If the diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index eb7b08f..a3d1433 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -25,6 +25,8 @@ #include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" +using content::BrowserThread; + namespace { // The dimensions of the certificate selector table view, in pixels. diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index 69596b8..f4e0336 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc @@ -21,6 +21,7 @@ using ::testing::Mock; using ::testing::StrictMock; +using content::BrowserThread; // We don't have a way to do end-to-end SSL client auth testing, so this test // creates a certificate selector_ manually with a mocked diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc index d8efac1..49c4ee7 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc @@ -30,6 +30,7 @@ #include "views/drag_utils.h" #include "webkit/glue/webdropdata.h" +using content::BrowserThread; using WebKit::WebDragOperationsMask; using WebKit::WebDragOperationCopy; using WebKit::WebDragOperationLink; diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc index 70712d9..a1bd2f4 100644 --- a/chrome/browser/ui/web_applications/web_app_ui.cc +++ b/chrome/browser/ui/web_applications/web_app_ui.cc @@ -26,6 +26,8 @@ #include "base/environment.h" #endif +using content::BrowserThread; + namespace { #if defined(OS_WIN) diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc index 7a1b428..c324e2b 100644 --- a/chrome/browser/ui/webui/bug_report_ui.cc +++ b/chrome/browser/ui/webui/bug_report_ui.cc @@ -43,6 +43,8 @@ #include "chrome/browser/chromeos/system/syslogs_provider.h" #endif +using content::BrowserThread; + namespace { const char kScreenshotBaseUrl[] = "chrome://screenshots/"; diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.cc b/chrome/browser/ui/webui/chrome_url_data_manager.cc index 408de1d..23b61e7 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager.cc @@ -25,6 +25,8 @@ #include "base/win/windows_version.h" #endif +using content::BrowserThread; + // static base::Lock ChromeURLDataManager::delete_lock_; diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc index b7a5881..51ddb00 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc @@ -37,6 +37,8 @@ #include "net/url_request/url_request_job_factory.h" #include "webkit/appcache/view_appcache_internals_job.h" +using content::BrowserThread; + namespace { // X-WebKit-CSP is our development name for Content-Security-Policy. diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index e61afe8..ec3ec6b 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -26,6 +26,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/bytes_formatting.h" +using content::BrowserThread; + namespace { const char kPropertyDevicePath[] = "devicePath"; diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc index c13f882..8bec8d5 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc @@ -13,6 +13,8 @@ #include "content/browser/download/download_types.h" #include "content/public/browser/browser_thread.h" +using content::BrowserThread; + namespace imageburner { static const char kConfigFileUrl[] = diff --git a/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h b/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h index ee03ab5..281cf98 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h +++ b/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h @@ -23,6 +23,8 @@ #include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" +using content::BrowserThread; + namespace imageburner { enum ProgressType { diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index 519f47d..0561932 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -35,6 +35,8 @@ #include "net/base/dnsrr_resolver.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; + namespace { const char kDefaultDomain[] = "@gmail.com"; diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc index a271ca2..64a753d 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc @@ -16,6 +16,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; + class MobileSetupDialogDelegate : public HtmlDialogUIDelegate { public: static MobileSetupDialogDelegate* GetInstance(); diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 3482dce..2f5e7fb 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -43,6 +43,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +using content::BrowserThread; + namespace { // Host page JS API function names. diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index ae0da5c..22b0690 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc @@ -28,6 +28,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +using content::BrowserThread; + namespace { // JS API callbacks names. diff --git a/chrome/browser/ui/webui/cloud_print_signin_dialog.cc b/chrome/browser/ui/webui/cloud_print_signin_dialog.cc index d8fdd28..20f3bfc 100644 --- a/chrome/browser/ui/webui/cloud_print_signin_dialog.cc +++ b/chrome/browser/ui/webui/cloud_print_signin_dialog.cc @@ -22,6 +22,8 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +using content::BrowserThread; + // This module implements a sign in dialog for cloud print. // it is based heavily off "chrome/browser/printing/print_dialog_cloud.cc". // See the comments in that file for a discussion about how this works. diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index e666094..8a66808 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc @@ -19,6 +19,8 @@ #include "grit/devtools_resources_map.h" #include "ui/base/resource/resource_bundle.h" +using content::BrowserThread; + namespace { std::string PathWithoutParams(const std::string& path) { diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index c4af116..8e7cc4e 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -39,6 +39,8 @@ #include "content/public/browser/browser_thread.h" #endif +using content::BrowserThread; + namespace { // Maximum number of downloads to show. TODO(glen): Remove this and instead diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc index bdadcb7..cb9087b 100644 --- a/chrome/browser/ui/webui/gpu_internals_ui.cc +++ b/chrome/browser/ui/webui/gpu_internals_ui.cc @@ -26,6 +26,8 @@ #include "third_party/angle/src/common/version.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; + namespace { ChromeWebUIDataSource* CreateGpuHTMLSource() { diff --git a/chrome/browser/ui/webui/media/media_internals_handler.cc b/chrome/browser/ui/webui/media/media_internals_handler.cc index 910f9e4..6798ad5 100644 --- a/chrome/browser/ui/webui/media/media_internals_handler.cc +++ b/chrome/browser/ui/webui/media/media_internals_handler.cc @@ -13,6 +13,8 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/browser_thread.h" +using content::BrowserThread; + MediaInternalsMessageHandler::MediaInternalsMessageHandler() : proxy_(new MediaInternalsProxy()) {} diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.cc b/chrome/browser/ui/webui/media/media_internals_proxy.cc index c04bc0c..928a019 100644 --- a/chrome/browser/ui/webui/media/media_internals_proxy.cc +++ b/chrome/browser/ui/webui/media/media_internals_proxy.cc @@ -13,6 +13,8 @@ #include "content/browser/renderer_host/render_process_host.h" #include "content/public/browser/notification_types.h" +using content::BrowserThread; + static const int kMediaInternalsProxyEventDelayMilliseconds = 100; static const net::NetLog::EventType kNetEventTypeFilter[] = { diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.h b/chrome/browser/ui/webui/media/media_internals_proxy.h index 6350a3b..89f228d 100644 --- a/chrome/browser/ui/webui/media/media_internals_proxy.h +++ b/chrome/browser/ui/webui/media/media_internals_proxy.h @@ -28,8 +28,9 @@ class Value; // threads before destruction. class MediaInternalsProxy : public MediaInternalsObserver, - public base::RefCountedThreadSafe<MediaInternalsProxy, - BrowserThread::DeleteOnUIThread>, + public base::RefCountedThreadSafe< + MediaInternalsProxy, + content::BrowserThread::DeleteOnUIThread>, public ChromeNetLog::ThreadSafeObserverImpl, public content::NotificationObserver { public: @@ -60,7 +61,8 @@ class MediaInternalsProxy net::NetLog::EventParameters* params) OVERRIDE; private: - friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>; + friend struct content::BrowserThread::DeleteOnThread< + content::BrowserThread::UI>; friend class DeleteTask<MediaInternalsProxy>; virtual ~MediaInternalsProxy(); diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc index 0e24eee..e873fc4 100644 --- a/chrome/browser/ui/webui/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals_ui.cc @@ -71,6 +71,8 @@ #include "chrome/browser/net/service_providers_win.h" #endif +using content::BrowserThread; + namespace { // Delay between when an event occurs and when it is passed to the Javascript diff --git a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc index ec7427b..45d5b36 100644 --- a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc @@ -31,6 +31,8 @@ #include "net/url_request/url_request_context_getter.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + namespace { // Called on IO thread. Adds an entry to the cache for the specified hostname. diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 1353623..a5ed004 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -51,6 +51,8 @@ #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; + namespace { // The amount of time there must be no painting for us to consider painting diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 4c317d8..64a42ae 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -60,6 +60,7 @@ #endif using base::Time; +using content::BrowserThread; namespace { diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc index e67c2bf..fd07b1a 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc @@ -17,6 +17,8 @@ #include "content/common/process_watcher.h" #include "content/public/browser/browser_thread.h" +using content::BrowserThread; + // Command used to configure GNOME 2 proxy settings. const char* kGNOME2ProxyConfigCommand[] = {"gnome-network-properties", NULL}; // In GNOME 3, we might need to run gnome-control-center instead. We try this diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc index 0d3dbf2..abe0c7d 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc @@ -29,6 +29,8 @@ #include "chrome/browser/chromeos/cros/cryptohome_library.h" #endif +using content::BrowserThread; + namespace { static const char kKeyId[] = "id"; diff --git a/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc index 18d282d8..30a353a 100644 --- a/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc @@ -36,6 +36,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +using content::BrowserThread; + namespace { void TouchpadExistsFileThread(bool* exists) { diff --git a/chrome/browser/ui/webui/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview_handler.cc index b134c60..66e4aa3 100644 --- a/chrome/browser/ui/webui/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview_handler.cc @@ -58,6 +58,8 @@ #include "chrome/common/chrome_switches.h" #endif +using content::BrowserThread; + namespace { enum UserActionBuckets { diff --git a/chrome/browser/ui/webui/quota_internals_proxy.cc b/chrome/browser/ui/webui/quota_internals_proxy.cc index e217d37..100f6d5 100644 --- a/chrome/browser/ui/webui/quota_internals_proxy.cc +++ b/chrome/browser/ui/webui/quota_internals_proxy.cc @@ -12,6 +12,8 @@ #include "chrome/browser/ui/webui/quota_internals_types.h" #include "net/base/net_util.h" +using content::BrowserThread; + namespace quota_internals { QuotaInternalsProxy::QuotaInternalsProxy(QuotaInternalsHandler* handler) diff --git a/chrome/browser/ui/webui/quota_internals_proxy.h b/chrome/browser/ui/webui/quota_internals_proxy.h index 7eca9a5..97e51cf 100644 --- a/chrome/browser/ui/webui/quota_internals_proxy.h +++ b/chrome/browser/ui/webui/quota_internals_proxy.h @@ -29,8 +29,9 @@ typedef std::map<std::string, std::string> Statistics; // Each QuotaInternalsHandler instances creates and owns a instance of this // class. class QuotaInternalsProxy - : public base::RefCountedThreadSafe<QuotaInternalsProxy, - BrowserThread::DeleteOnIOThread> { + : public base::RefCountedThreadSafe< + QuotaInternalsProxy, + content::BrowserThread::DeleteOnIOThread> { public: explicit QuotaInternalsProxy(QuotaInternalsHandler* handler); ~QuotaInternalsProxy(); @@ -77,7 +78,8 @@ class QuotaInternalsProxy std::vector<PerHostStorageInfo> report_pending_; friend class QuotaInternalsHandler; - friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>; + friend struct content::BrowserThread::DeleteOnThread< + content::BrowserThread::IO>; friend class DeleteTask<QuotaInternalsProxy>; DISALLOW_COPY_AND_ASSIGN(QuotaInternalsProxy); diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index 0d30a19..97338da 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -69,6 +69,7 @@ void ScreenshotSource::SendScreenshot(const std::string& screenshot_path, #if defined(OS_CHROMEOS) } else if (path.compare(0, strlen(kSavedScreenshotsBasePath), kSavedScreenshotsBasePath) == 0) { + using content::BrowserThread; BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind(&ScreenshotSource::SendSavedScreenshot, base::Unretained(this), path, diff --git a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc index 442155b..9e5fe31 100644 --- a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc +++ b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc @@ -26,6 +26,7 @@ namespace { using browser_sync::HasArgsAsList; using browser_sync::JsArgList; using browser_sync::JsEventDetails; +using content::BrowserThread; using testing::_; using testing::Mock; using testing::NiceMock; diff --git a/chrome/browser/ui/webui/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager_dialog.cc index bea6cb2..3f5c9e7 100644 --- a/chrome/browser/ui/webui/task_manager_dialog.cc +++ b/chrome/browser/ui/webui/task_manager_dialog.cc @@ -20,6 +20,8 @@ #include "views/widget/widget.h" #endif +using content::BrowserThread; + class TaskManagerDialogImpl : public HtmlDialogUIDelegate { public: TaskManagerDialogImpl(); diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index f33b546..bc07fff 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -18,6 +18,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +using content::BrowserThread; + // use a resource map rather than hard-coded strings. static const char* kNewTabCSSPath = "css/newtab.css"; static const char* kNewIncognitoTabCSSPath = "css/newincognitotab.css"; diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc index 1355216..51f4107 100644 --- a/chrome/browser/ui/webui/theme_source_unittest.cc +++ b/chrome/browser/ui/webui/theme_source_unittest.cc @@ -12,6 +12,8 @@ #include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + // A mock ThemeSource (so we can override SendResponse to get at its data). class MockThemeSource : public ThemeSource { public: diff --git a/chrome/browser/ui/webui/tracing_ui.cc b/chrome/browser/ui/webui/tracing_ui.cc index f314ed9..05456ec 100644 --- a/chrome/browser/ui/webui/tracing_ui.cc +++ b/chrome/browser/ui/webui/tracing_ui.cc @@ -27,6 +27,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +using content::BrowserThread; + namespace { ChromeWebUIDataSource* CreateTracingHTMLSource() { diff --git a/chrome/browser/ui/webui/tracking_ui.cc b/chrome/browser/ui/webui/tracking_ui.cc index 76bb088..44aa0db 100644 --- a/chrome/browser/ui/webui/tracking_ui.cc +++ b/chrome/browser/ui/webui/tracking_ui.cc @@ -16,6 +16,8 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" +using content::BrowserThread; + namespace { ChromeWebUIDataSource* CreateTrackingHTMLSource() { diff --git a/chrome/browser/ui/webui/web_ui_unittest.cc b/chrome/browser/ui/webui/web_ui_unittest.cc index 0bbdfe0..19e15e8 100644 --- a/chrome/browser/ui/webui/web_ui_unittest.cc +++ b/chrome/browser/ui/webui/web_ui_unittest.cc @@ -14,6 +14,8 @@ #include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThread; + class WebUITest : public TabContentsWrapperTestHarness { public: WebUITest() : ui_thread_(BrowserThread::UI, MessageLoop::current()) {} diff --git a/chrome/browser/ui/webui/workers_ui.cc b/chrome/browser/ui/webui/workers_ui.cc index d3ade6d..877e2abd 100644 --- a/chrome/browser/ui/webui/workers_ui.cc +++ b/chrome/browser/ui/webui/workers_ui.cc @@ -28,6 +28,8 @@ #include "grit/workers_resources.h" #include "ui/base/resource/resource_bundle.h" +using content::BrowserThread; + static const char kWorkersDataFile[] = "workers_data.json"; static const char kOpenDevToolsCommand[] = "openDevTools"; |