diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 23:12:48 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 23:12:48 +0000 |
| commit | 316f96a6b665ae43011d336f5ffb08414cba0391 (patch) | |
| tree | 7f21668a774b5d7e90c3c42c4f656a2989fde2ae /chrome/browser/gtk/options | |
| parent | 1cb92b82067bc2ed57f41aee7eb39269df91f4f0 (diff) | |
| download | chromium_src-316f96a6b665ae43011d336f5ffb08414cba0391.zip chromium_src-316f96a6b665ae43011d336f5ffb08414cba0391.tar.gz chromium_src-316f96a6b665ae43011d336f5ffb08414cba0391.tar.bz2 | |
chrome 4: string_util.h -> utf_string_conversions.h fix.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/671019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40960 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options')
4 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/gtk/options/content_exceptions_window_gtk.cc b/chrome/browser/gtk/options/content_exceptions_window_gtk.cc index 869ab20..cabf064 100644 --- a/chrome/browser/gtk/options/content_exceptions_window_gtk.cc +++ b/chrome/browser/gtk/options/content_exceptions_window_gtk.cc @@ -4,9 +4,12 @@ #include "chrome/browser/gtk/options/content_exceptions_window_gtk.h" +#include <set> + #include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/message_loop.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/options/content_exception_editor.h" #include "grit/generated_resources.h" @@ -172,7 +175,7 @@ void ContentExceptionsWindowGtk::AcceptExceptionEdit(const std::string& host, model_->AddException(host, setting); int new_index = model_->IndexOfExceptionByHost(host); - DCHECK(new_index != -1); + DCHECK_NE(-1, new_index); GtkTreePath* path = gtk_tree_path_new_from_indices(new_index, -1); gtk_tree_selection_select_path(treeview_selection_, path); diff --git a/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc b/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc index 6b62087..1bd4c7b 100644 --- a/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc +++ b/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc @@ -4,9 +4,12 @@ #include "chrome/browser/gtk/options/passwords_exceptions_page_gtk.h" +#include <string> + #include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_tree.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/pref_service.h" diff --git a/chrome/browser/gtk/options/passwords_page_gtk.cc b/chrome/browser/gtk/options/passwords_page_gtk.cc index a0112e7..f52a901 100644 --- a/chrome/browser/gtk/options/passwords_page_gtk.cc +++ b/chrome/browser/gtk/options/passwords_page_gtk.cc @@ -4,9 +4,12 @@ #include "chrome/browser/gtk/options/passwords_page_gtk.h" +#include <string> + #include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_tree.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/pref_service.h" diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc index 6e3b1c5..f89a199 100644 --- a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc +++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc @@ -7,6 +7,7 @@ #include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/message_loop.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" #include "chrome/browser/gtk/gtk_tree.h" #include "chrome/browser/gtk/gtk_util.h" |