diff options
Diffstat (limited to 'chrome/browser/ui/webui')
36 files changed, 75 insertions, 6 deletions
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"; |