| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/gtk/options/content_settings_window_gtk.h" | 5 #include "chrome/browser/ui/gtk/options/content_settings_window_gtk.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
| 12 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" | |
| 13 #include "chrome/browser/gtk/browser_window_gtk.h" | |
| 14 #include "chrome/browser/gtk/gtk_util.h" | |
| 15 #include "chrome/browser/gtk/gtk_tree.h" | |
| 16 #include "chrome/browser/prefs/pref_service.h" | 12 #include "chrome/browser/prefs/pref_service.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/ui/browser_list.h" | 14 #include "chrome/browser/ui/browser_list.h" |
| 15 #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" |
| 16 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 17 #include "chrome/browser/ui/gtk/gtk_tree.h" |
| 18 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 19 #include "chrome/common/content_settings_types.h" | 19 #include "chrome/common/content_settings_types.h" |
| 20 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
| 21 #include "grit/chromium_strings.h" | 21 #include "grit/chromium_strings.h" |
| 22 #include "grit/generated_resources.h" | 22 #include "grit/generated_resources.h" |
| 23 #include "grit/locale_settings.h" | 23 #include "grit/locale_settings.h" |
| 24 | 24 |
| 25 namespace { | 25 namespace { |
| 26 | 26 |
| 27 // The singleton options window object. | 27 // The singleton options window object. |
| 28 ContentSettingsWindowGtk* settings_window = NULL; | 28 ContentSettingsWindowGtk* settings_window = NULL; |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 } | 230 } |
| 231 gint row_index = gtk_tree::GetRowNumForIter(model, &iter); | 231 gint row_index = gtk_tree::GetRowNumForIter(model, &iter); |
| 232 DCHECK(row_index > CONTENT_SETTINGS_TYPE_DEFAULT && | 232 DCHECK(row_index > CONTENT_SETTINGS_TYPE_DEFAULT && |
| 233 row_index < CONTENT_SETTINGS_NUM_TYPES); | 233 row_index < CONTENT_SETTINGS_NUM_TYPES); |
| 234 | 234 |
| 235 last_selected_page_.SetValue(row_index); | 235 last_selected_page_.SetValue(row_index); |
| 236 | 236 |
| 237 if (row_index != gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_))) | 237 if (row_index != gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_))) |
| 238 gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook_), row_index); | 238 gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook_), row_index); |
| 239 } | 239 } |
| OLD | NEW |