summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-10 18:53:21 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-10 18:53:21 +0000
commit8bac235e7c08c21851934cf771d7d473b3beca4d (patch)
treed4a139e5d1edd3a746011340d4aadbe33e813cba /chrome/browser/cocoa
parent9e652efa6c344124a68a41ae41867a3b6b911666 (diff)
downloadchromium_src-8bac235e7c08c21851934cf771d7d473b3beca4d.zip
chromium_src-8bac235e7c08c21851934cf771d7d473b3beca4d.tar.gz
chromium_src-8bac235e7c08c21851934cf771d7d473b3beca4d.tar.bz2
Rename ChromeThread to BrowserThread Part13:
- Rename entries under appcache, automation, chromeos, cocoa, file_system, metrics, policy, prefs, remoting, search_engines and tab_contents. BUG=56926 TEST=trybots Review URL: http://codereview.chromium.org/3660002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/browser_test_helper.h12
-rw-r--r--chrome/browser/cocoa/bug_report_window_controller_unittest.mm2
-rw-r--r--chrome/browser/cocoa/collected_cookies_mac_unittest.mm2
-rw-r--r--chrome/browser/cocoa/extension_installed_bubble_controller.mm2
-rw-r--r--chrome/browser/cocoa/notifications/balloon_controller_unittest.mm8
-rw-r--r--chrome/browser/cocoa/ssl_client_certificate_selector.mm2
-rw-r--r--chrome/browser/cocoa/tabpose_window.mm4
7 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/cocoa/browser_test_helper.h b/chrome/browser/cocoa/browser_test_helper.h
index 4ff40ba..a5e22cb 100644
--- a/chrome/browser/cocoa/browser_test_helper.h
+++ b/chrome/browser/cocoa/browser_test_helper.h
@@ -28,9 +28,9 @@
class BrowserTestHelper {
public:
BrowserTestHelper()
- : ui_thread_(ChromeThread::UI, &message_loop_),
- file_thread_(new ChromeThread(ChromeThread::FILE, &message_loop_)),
- io_thread_(new ChromeThread(ChromeThread::IO, &message_loop_)) {
+ : ui_thread_(BrowserThread::UI, &message_loop_),
+ file_thread_(new BrowserThread(BrowserThread::FILE, &message_loop_)),
+ io_thread_(new BrowserThread(BrowserThread::IO, &message_loop_)) {
profile_.reset(new TestingProfile());
profile_->CreateBookmarkModel(true);
profile_->BlockUntilBookmarkModelLoaded();
@@ -84,9 +84,9 @@ class BrowserTestHelper {
scoped_ptr<TestingProfile> profile_;
scoped_ptr<Browser> browser_;
MessageLoopForUI message_loop_;
- ChromeThread ui_thread_;
- scoped_ptr<ChromeThread> file_thread_;
- scoped_ptr<ChromeThread> io_thread_;
+ BrowserThread ui_thread_;
+ scoped_ptr<BrowserThread> file_thread_;
+ scoped_ptr<BrowserThread> io_thread_;
};
#endif // CHROME_BROWSER_COCOA_BROWSER_TEST_HELPER_H_
diff --git a/chrome/browser/cocoa/bug_report_window_controller_unittest.mm b/chrome/browser/cocoa/bug_report_window_controller_unittest.mm
index 5c78c67..24a78dd 100644
--- a/chrome/browser/cocoa/bug_report_window_controller_unittest.mm
+++ b/chrome/browser/cocoa/bug_report_window_controller_unittest.mm
@@ -21,7 +21,7 @@ class BugReportWindowControllerUnittest : public RenderViewHostTestHarness {
// See http://crbug.com/29019 for why it's disabled.
TEST_F(BugReportWindowControllerUnittest, DISABLED_ReportBugWithNewTabPageOpen) {
- ChromeThread ui_thread(ChromeThread::UI, MessageLoop::current());
+ BrowserThread ui_thread(BrowserThread::UI, MessageLoop::current());
// Create a "chrome://newtab" test tab. SiteInstance will be deleted when
// tabContents is deleted.
SiteInstance* instance =
diff --git a/chrome/browser/cocoa/collected_cookies_mac_unittest.mm b/chrome/browser/cocoa/collected_cookies_mac_unittest.mm
index 033cc71..c0a8490 100644
--- a/chrome/browser/cocoa/collected_cookies_mac_unittest.mm
+++ b/chrome/browser/cocoa/collected_cookies_mac_unittest.mm
@@ -19,7 +19,7 @@ class CollectedCookiesWindowControllerTest : public RenderViewHostTestHarness {
};
TEST_F(CollectedCookiesWindowControllerTest, Construction) {
- ChromeThread ui_thread(ChromeThread::UI, MessageLoop::current());
+ BrowserThread ui_thread(BrowserThread::UI, MessageLoop::current());
// Create a test tab. SiteInstance will be deleted when tabContents is
// deleted.
SiteInstance* instance =
diff --git a/chrome/browser/cocoa/extension_installed_bubble_controller.mm b/chrome/browser/cocoa/extension_installed_bubble_controller.mm
index 4a22436..00cd535 100644
--- a/chrome/browser/cocoa/extension_installed_bubble_controller.mm
+++ b/chrome/browser/cocoa/extension_installed_bubble_controller.mm
@@ -203,7 +203,7 @@ class ExtensionLoadedNotificationObserver : public NotificationObserver {
- (void)showWindow:(id)sender {
// Generic extensions get an infobar rather than a bubble.
DCHECK(type_ != extension_installed_bubble::kGeneric);
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// Load nib and calculate height based on messages to be shown.
NSWindow* window = [self initializeWindow];
diff --git a/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm
index ff1176e..6f6a1ab 100644
--- a/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm
+++ b/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm
@@ -46,8 +46,8 @@ class MockBalloonCollection : public BalloonCollection {
class BalloonControllerTest : public RenderViewHostTestHarness {
public:
BalloonControllerTest() :
- ui_thread_(ChromeThread::UI, MessageLoop::current()),
- io_thread_(ChromeThread::IO, MessageLoop::current()) {
+ ui_thread_(BrowserThread::UI, MessageLoop::current()),
+ io_thread_(BrowserThread::IO, MessageLoop::current()) {
}
virtual void SetUp() {
@@ -65,8 +65,8 @@ class BalloonControllerTest : public RenderViewHostTestHarness {
}
protected:
- ChromeThread ui_thread_;
- ChromeThread io_thread_;
+ BrowserThread ui_thread_;
+ BrowserThread io_thread_;
scoped_ptr<TestingProfile> profile_;
scoped_ptr<Browser> browser_;
scoped_ptr<BalloonCollection> collection_;
diff --git a/chrome/browser/cocoa/ssl_client_certificate_selector.mm b/chrome/browser/cocoa/ssl_client_certificate_selector.mm
index b1d2da1..dd8dbc0 100644
--- a/chrome/browser/cocoa/ssl_client_certificate_selector.mm
+++ b/chrome/browser/cocoa/ssl_client_certificate_selector.mm
@@ -99,7 +99,7 @@ void ShowSSLClientCertificateSelector(
net::SSLCertRequestInfo* cert_request_info,
SSLClientAuthHandler* delegate) {
// TODO(davidben): Implement a tab-modal dialog.
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
SSLClientCertificateSelectorCocoa* selector =
[[[SSLClientCertificateSelectorCocoa alloc]
initWithHandler:delegate
diff --git a/chrome/browser/cocoa/tabpose_window.mm b/chrome/browser/cocoa/tabpose_window.mm
index 68c809c..011f10a 100644
--- a/chrome/browser/cocoa/tabpose_window.mm
+++ b/chrome/browser/cocoa/tabpose_window.mm
@@ -105,7 +105,7 @@ class ThumbnailLoader : public base::RefCountedThreadSafe<ThumbnailLoader> {
}
void DidReceiveBitmap(const SkBitmap& bitmap) {
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
ResetPaintingObserver();
[layer_ setThumbnail:bitmap];
}
@@ -127,7 +127,7 @@ class ThumbnailLoader : public base::RefCountedThreadSafe<ThumbnailLoader> {
};
void ThumbnailLoader::LoadThumbnail() {
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
ThumbnailGenerator* generator = g_browser_process->GetThumbnailGenerator();
if (!generator) // In unit tests.
return;