diff options
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/gtk/gtk_tree.cc | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/gtk_tree.h | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/options/content_exceptions_window_gtk.cc | 4 | ||||
-rw-r--r-- | chrome/browser/gtk/options/general_page_gtk.cc | 4 | ||||
-rw-r--r-- | chrome/browser/gtk/options/geolocation_content_exceptions_window.cc | 6 | ||||
-rw-r--r-- | chrome/browser/gtk/options/languages_page_gtk.cc | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/gtk/gtk_tree.cc b/chrome/browser/gtk/gtk_tree.cc index 6eb08b0..5594c58 100644 --- a/chrome/browser/gtk/gtk_tree.cc +++ b/chrome/browser/gtk/gtk_tree.cc @@ -65,7 +65,7 @@ bool RemoveRecursively(GtkTreeStore* tree_store, GtkTreeIter* iter) { return gtk_tree_store_remove(tree_store, iter); } -void GetSelectedIndicies(GtkTreeSelection* selection, std::set<int>* out) { +void GetSelectedIndices(GtkTreeSelection* selection, std::set<int>* out) { GList* list = gtk_tree_selection_get_selected_rows( selection, NULL); GList* node; diff --git a/chrome/browser/gtk/gtk_tree.h b/chrome/browser/gtk/gtk_tree.h index 744d83e..1357315e1 100644 --- a/chrome/browser/gtk/gtk_tree.h +++ b/chrome/browser/gtk/gtk_tree.h @@ -38,7 +38,7 @@ void SelectAndFocusRowNum(int row, GtkTreeView* tree_view); bool RemoveRecursively(GtkTreeStore* tree_store, GtkTreeIter* iter); // Writes all the indexes of selected rows into |out|. -void GetSelectedIndicies(GtkTreeSelection* selection, std::set<int>* out); +void GetSelectedIndices(GtkTreeSelection* selection, std::set<int>* out); // A helper class for populating a GtkListStore from a TableModel. class TableAdapter : public TableModelObserver { diff --git a/chrome/browser/gtk/options/content_exceptions_window_gtk.cc b/chrome/browser/gtk/options/content_exceptions_window_gtk.cc index 04929c5..b808a3f 100644 --- a/chrome/browser/gtk/options/content_exceptions_window_gtk.cc +++ b/chrome/browser/gtk/options/content_exceptions_window_gtk.cc @@ -205,7 +205,7 @@ void ContentExceptionsWindowGtk::Add(GtkWidget* widget) { void ContentExceptionsWindowGtk::Edit(GtkWidget* widget) { std::set<int> indices; - gtk_tree::GetSelectedIndicies(treeview_selection_, &indices); + gtk_tree::GetSelectedIndices(treeview_selection_, &indices); DCHECK_GT(indices.size(), 0u); int index = *indices.begin(); const HostContentSettingsMap::PatternSettingPair& entry = @@ -216,7 +216,7 @@ void ContentExceptionsWindowGtk::Edit(GtkWidget* widget) { void ContentExceptionsWindowGtk::Remove(GtkWidget* widget) { std::set<int> indices; - gtk_tree::GetSelectedIndicies(treeview_selection_, &indices); + gtk_tree::GetSelectedIndices(treeview_selection_, &indices); for (std::set<int>::reverse_iterator i = indices.rbegin(); i != indices.rend(); ++i) { diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc index 16a0a05..836f2a7 100644 --- a/chrome/browser/gtk/options/general_page_gtk.cc +++ b/chrome/browser/gtk/options/general_page_gtk.cc @@ -532,7 +532,7 @@ void GeneralPageGtk::SetCustomUrlListFromCurrentPages() { void GeneralPageGtk::OnAddCustomUrl(const GURL& url) { std::set<int> indices; - gtk_tree::GetSelectedIndicies(startup_custom_pages_selection_, &indices); + gtk_tree::GetSelectedIndices(startup_custom_pages_selection_, &indices); int index; if (indices.empty()) index = startup_custom_pages_table_model_->RowCount(); @@ -548,7 +548,7 @@ void GeneralPageGtk::OnAddCustomUrl(const GURL& url) { void GeneralPageGtk::RemoveSelectedCustomUrls() { std::set<int> indices; - gtk_tree::GetSelectedIndicies(startup_custom_pages_selection_, &indices); + gtk_tree::GetSelectedIndices(startup_custom_pages_selection_, &indices); int selected_row = 0; for (std::set<int>::reverse_iterator i = indices.rbegin(); diff --git a/chrome/browser/gtk/options/geolocation_content_exceptions_window.cc b/chrome/browser/gtk/options/geolocation_content_exceptions_window.cc index 84c4b57..2b46fd9 100644 --- a/chrome/browser/gtk/options/geolocation_content_exceptions_window.cc +++ b/chrome/browser/gtk/options/geolocation_content_exceptions_window.cc @@ -147,9 +147,9 @@ void GeolocationContentExceptionsWindow::UpdateButtonState() { void GeolocationContentExceptionsWindow::GetSelectedRows( GeolocationContentSettingsTableModel::Rows* rows) { - std::set<int> indicies; - gtk_tree::GetSelectedIndicies(treeview_selection_, &indicies); - for (std::set<int>::iterator i = indicies.begin(); i != indicies.end(); ++i) + std::set<int> indices; + gtk_tree::GetSelectedIndices(treeview_selection_, &indices); + for (std::set<int>::iterator i = indices.begin(); i != indices.end(); ++i) rows->insert(*i); } diff --git a/chrome/browser/gtk/options/languages_page_gtk.cc b/chrome/browser/gtk/options/languages_page_gtk.cc index 570f220..c271122 100644 --- a/chrome/browser/gtk/options/languages_page_gtk.cc +++ b/chrome/browser/gtk/options/languages_page_gtk.cc @@ -367,8 +367,8 @@ void LanguagesPageGtk::OnAddButtonClicked(GtkWidget* button) { void LanguagesPageGtk::OnRemoveButtonClicked(GtkWidget* button) { std::set<int> selected_rows; - gtk_tree::GetSelectedIndicies(language_order_selection_, - &selected_rows); + gtk_tree::GetSelectedIndices(language_order_selection_, + &selected_rows); int selected_row = 0; for (std::set<int>::reverse_iterator selected = selected_rows.rbegin(); |