| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/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/browser.h" | 12 #include "chrome/browser/browser.h" |
| 13 #include "chrome/browser/browser_list.h" | 13 #include "chrome/browser/browser_list.h" |
| 14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
| 15 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" | 15 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" |
| 16 #include "chrome/browser/gtk/browser_window_gtk.h" | 16 #include "chrome/browser/gtk/browser_window_gtk.h" |
| 17 #include "chrome/browser/gtk/gtk_util.h" | 17 #include "chrome/browser/gtk/gtk_util.h" |
| 18 #include "chrome/browser/gtk/gtk_tree.h" | 18 #include "chrome/browser/gtk/gtk_tree.h" |
| 19 #include "chrome/browser/pref_service.h" | 19 #include "chrome/browser/prefs/pref_service.h" |
| 20 #include "chrome/browser/profile.h" | 20 #include "chrome/browser/profile.h" |
| 21 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
| 22 #include "chrome/common/content_settings_types.h" | 22 #include "chrome/common/content_settings_types.h" |
| 23 #include "chrome/common/notification_service.h" | 23 #include "chrome/common/notification_service.h" |
| 24 #include "chrome/common/pref_names.h" | 24 #include "chrome/common/pref_names.h" |
| 25 #include "grit/chromium_strings.h" | 25 #include "grit/chromium_strings.h" |
| 26 #include "grit/generated_resources.h" | 26 #include "grit/generated_resources.h" |
| 27 #include "grit/locale_settings.h" | 27 #include "grit/locale_settings.h" |
| 28 | 28 |
| 29 namespace { | 29 namespace { |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 } | 234 } |
| 235 gint row_index = gtk_tree::GetRowNumForIter(model, &iter); | 235 gint row_index = gtk_tree::GetRowNumForIter(model, &iter); |
| 236 DCHECK(row_index > CONTENT_SETTINGS_TYPE_DEFAULT && | 236 DCHECK(row_index > CONTENT_SETTINGS_TYPE_DEFAULT && |
| 237 row_index < CONTENT_SETTINGS_NUM_TYPES); | 237 row_index < CONTENT_SETTINGS_NUM_TYPES); |
| 238 | 238 |
| 239 last_selected_page_.SetValue(row_index); | 239 last_selected_page_.SetValue(row_index); |
| 240 | 240 |
| 241 if (row_index != gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_))) | 241 if (row_index != gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_))) |
| 242 gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook_), row_index); | 242 gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook_), row_index); |
| 243 } | 243 } |
| OLD | NEW |