diff options
author | jyasskin@chromium.org <jyasskin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 06:41:18 +0000 |
---|---|---|
committer | jyasskin@chromium.org <jyasskin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 06:41:18 +0000 |
commit | a4a46be32d27e4961512f35b85f9b25ced8bee29 (patch) | |
tree | 356805526e43d60654b529ed044c17a332ff52f8 /chrome/browser/ui/libgtk2ui | |
parent | 66e8fe6e3b21d65778b3d600fdda5e07b2b66727 (diff) | |
download | chromium_src-a4a46be32d27e4961512f35b85f9b25ced8bee29.zip chromium_src-a4a46be32d27e4961512f35b85f9b25ced8bee29.tar.gz chromium_src-a4a46be32d27e4961512f35b85f9b25ced8bee29.tar.bz2 |
Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in chrome/browser/ui.
This is a follow-up to
https://src.chromium.org/viewvc/chrome?revision=256913&view=revision that makes
error messages more descriptive.
It was automatically produced with
git grep -l 'DCHECK(.*CurrentlyOn' chrome/browser/ui |xargs sed -i -e 's/DCHECK(BrowserThread::CurrentlyOn(\([^)]*\)))/DCHECK_CURRENTLY_ON(\1)/' -e 's/DCHECK(content::BrowserThread::CurrentlyOn(\([^)]*\)))/DCHECK_CURRENTLY_ON(\1)/'
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/220123003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/libgtk2ui')
4 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/ui/libgtk2ui/app_indicator_icon.cc b/chrome/browser/ui/libgtk2ui/app_indicator_icon.cc index 1586288..7ef1c40 100644 --- a/chrome/browser/ui/libgtk2ui/app_indicator_icon.cc +++ b/chrome/browser/ui/libgtk2ui/app_indicator_icon.cc @@ -262,7 +262,7 @@ void AppIndicatorIcon::RefreshPlatformContextMenu() { } void AppIndicatorIcon::SetImageFromFile(const base::FilePath& icon_file_path) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); if (icon_file_path.empty()) return; diff --git a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc index 06cb926..ad36c46 100644 --- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc +++ b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc @@ -120,7 +120,7 @@ class GtkPrinterList { // static printing::PrintDialogGtkInterface* PrintDialogGtk2::CreatePrintDialog( PrintingContextLinux* context) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); return new PrintDialogGtk2(context); } @@ -133,7 +133,7 @@ PrintDialogGtk2::PrintDialogGtk2(PrintingContextLinux* context) } PrintDialogGtk2::~PrintDialogGtk2() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (dialog_) { gtk_widget_destroy(dialog_); @@ -385,7 +385,7 @@ void PrintDialogGtk2::OnResponse(GtkWidget* dialog, int response_id) { void PrintDialogGtk2::SendDocumentToPrinter( const base::string16& document_name) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // If |printer_| is NULL then somehow the GTK printer list changed out under // us. In which case, just bail out. diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.cc index 450f2b4..68ff6b8 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.cc @@ -35,7 +35,7 @@ base::FilePath* SelectFileDialogImpl::last_opened_path_ = NULL; ui::SelectFileDialog* SelectFileDialogImpl::Create( ui::SelectFileDialog::Listener* listener, ui::SelectFilePolicy* policy) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (use_kde_ == UNKNOWN) { // Start out assumimg we are not going to use KDE. use_kde_ = NO_KDE; diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc index 784d561..b0c121b 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc @@ -238,7 +238,7 @@ bool SelectFileDialogImplKDE::HasMultipleFileTypeChoicesImpl() { } std::string SelectFileDialogImplKDE::GetMimeTypeFilterString() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); std::string filter_string; // We need a filter set because the same mime type can appear multiple times. std::set<std::string> filter_set; @@ -265,7 +265,7 @@ std::string SelectFileDialogImplKDE::GetMimeTypeFilterString() { } void SelectFileDialogImplKDE::CallKDialogOutput(const KDialogParams& params) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); CommandLine::StringVector cmd_vector; cmd_vector.push_back(kKdialogBinary); CommandLine command_line(cmd_vector); @@ -441,19 +441,19 @@ void SelectFileDialogImplKDE::SelectSingleFileHelper(const std::string& output, void SelectFileDialogImplKDE::OnSelectSingleFileDialogResponse( const std::string& output, int exit_code, void* params) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); SelectSingleFileHelper(output, exit_code, params, false); } void SelectFileDialogImplKDE::OnSelectSingleFolderDialogResponse( const std::string& output, int exit_code, void* params) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); SelectSingleFileHelper(output, exit_code, params, true); } void SelectFileDialogImplKDE::OnSelectMultiFileDialogResponse( const std::string& output, int exit_code, void* params) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); VLOG(1) << "[kdialog] MultiFileResponse: " << output; if (exit_code != 0 || output.empty()) { |