summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authordarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-26 05:55:10 +0000
committerdarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-26 05:55:10 +0000
commitab820df141e6ab45fd8a095d2f57f91df44e6c9c (patch)
tree20ae83601c4a484cd74c908b62bc9d702ef27996 /chrome/browser/views
parent4d9bdfafcd1393385860bc9fe947e0c07719c0f4 (diff)
downloadchromium_src-ab820df141e6ab45fd8a095d2f57f91df44e6c9c.zip
chromium_src-ab820df141e6ab45fd8a095d2f57f91df44e6c9c.tar.gz
chromium_src-ab820df141e6ab45fd8a095d2f57f91df44e6c9c.tar.bz2
Chrome changes corresponding to my message_loop_type CL.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/bookmark_editor_view_unittest.cc1
-rw-r--r--chrome/browser/views/keyword_editor_view_unittest.cc1
-rw-r--r--chrome/browser/views/options/advanced_contents_view.cc2
-rw-r--r--chrome/browser/views/shell_dialogs.cc12
4 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/views/bookmark_editor_view_unittest.cc b/chrome/browser/views/bookmark_editor_view_unittest.cc
index e69e934..93a99bf 100644
--- a/chrome/browser/views/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/views/bookmark_editor_view_unittest.cc
@@ -32,6 +32,7 @@ class BookmarkEditorViewTest : public testing::Test {
}
protected:
+ MessageLoopForUI message_loop_;
BookmarkBarModel* model_;
scoped_ptr<TestingProfile> profile_;
diff --git a/chrome/browser/views/keyword_editor_view_unittest.cc b/chrome/browser/views/keyword_editor_view_unittest.cc
index 84b3f0d..7afee5d 100644
--- a/chrome/browser/views/keyword_editor_view_unittest.cc
+++ b/chrome/browser/views/keyword_editor_view_unittest.cc
@@ -62,6 +62,7 @@ class KeywordEditorViewTest : public testing::Test,
}
protected:
+ MessageLoopForUI message_loop_;
scoped_ptr<TestingProfile> profile_;
scoped_ptr<KeywordEditorView> editor_;
TemplateURLModel* model_;
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index 46a4521..c70d80e 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -957,7 +957,7 @@ NetworkSection::NetworkSection(Profile* profile)
void NetworkSection::ButtonPressed(ChromeViews::NativeButton* sender) {
if (sender == change_proxies_button_) {
UserMetricsRecordAction(L"Options_ChangeProxies", NULL);
- Thread* thread = g_browser_process->file_thread();
+ base::Thread* thread = g_browser_process->file_thread();
DCHECK(thread);
thread->message_loop()->PostTask(FROM_HERE, new OpenConnectionDialogTask);
} else if (sender == enable_link_doctor_checkbox_) {
diff --git a/chrome/browser/views/shell_dialogs.cc b/chrome/browser/views/shell_dialogs.cc
index 02b57d9..10f0399 100644
--- a/chrome/browser/views/shell_dialogs.cc
+++ b/chrome/browser/views/shell_dialogs.cc
@@ -20,9 +20,9 @@
#include "chrome/common/win_util.h"
#include "generated_resources.h"
-class ShellDialogThread : public Thread {
+class ShellDialogThread : public base::Thread {
public:
- ShellDialogThread() : Thread("Chrome_ShellDialogThread") { }
+ ShellDialogThread() : base::Thread("Chrome_ShellDialogThread") { }
protected:
void Init() {
@@ -55,7 +55,7 @@ class BaseShellDialogImpl {
HWND owner;
// Thread dialog is run on.
- Thread* dialog_thread;
+ base::Thread* dialog_thread;
};
// Called at the beginning of a modal dialog run. Disables the owner window
@@ -93,7 +93,7 @@ class BaseShellDialogImpl {
// thread otherwise in some situations where a singleton owns a single
// instance of this object we can have a situation where a modal dialog in
// one window blocks the appearance of a modal dialog in another.
- static Thread* CreateDialogThread();
+ static base::Thread* CreateDialogThread();
// Enables the window |owner_|. Can only be run from the ui thread.
void EnableOwner(HWND owner);
@@ -169,8 +169,8 @@ void BaseShellDialogImpl::DisableOwner(HWND owner) {
}
// static
-Thread* BaseShellDialogImpl::CreateDialogThread() {
- Thread* thread = new ShellDialogThread;
+base::Thread* BaseShellDialogImpl::CreateDialogThread() {
+ base::Thread* thread = new ShellDialogThread;
bool started = thread->Start();
DCHECK(started);
return thread;