| 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/options_window.h" | 5 #include "chrome/browser/options_window.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 general_page_(profile_), | 91 general_page_(profile_), |
| 92 content_page_(profile_), | 92 content_page_(profile_), |
| 93 advanced_page_(profile_) { | 93 advanced_page_(profile_) { |
| 94 | 94 |
| 95 // We don't need to observe changes in this value. | 95 // We don't need to observe changes in this value. |
| 96 last_selected_page_.Init(prefs::kOptionsWindowLastTabIndex, | 96 last_selected_page_.Init(prefs::kOptionsWindowLastTabIndex, |
| 97 g_browser_process->local_state(), NULL); | 97 g_browser_process->local_state(), NULL); |
| 98 | 98 |
| 99 std::string dialog_name = | 99 std::string dialog_name = |
| 100 l10n_util::GetStringFUTF8( | 100 l10n_util::GetStringFUTF8( |
| 101 IDS_OPTIONS_DIALOG_TITLE, | 101 IDS_PREFERENCES_DIALOG_TITLE, |
| 102 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 102 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 103 dialog_ = gtk_dialog_new_with_buttons( | 103 dialog_ = gtk_dialog_new_with_buttons( |
| 104 dialog_name.c_str(), | 104 dialog_name.c_str(), |
| 105 // Prefs window is shared between all browser windows. | 105 // Prefs window is shared between all browser windows. |
| 106 NULL, | 106 NULL, |
| 107 // Non-modal. | 107 // Non-modal. |
| 108 GTK_DIALOG_NO_SEPARATOR, | 108 GTK_DIALOG_NO_SEPARATOR, |
| 109 GTK_STOCK_CLOSE, | 109 GTK_STOCK_CLOSE, |
| 110 GTK_RESPONSE_CLOSE, | 110 GTK_RESPONSE_CLOSE, |
| 111 NULL); | 111 NULL); |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 | 260 |
| 261 // Create the options window. | 261 // Create the options window. |
| 262 options_window = new OptionsWindowGtk(profile); | 262 options_window = new OptionsWindowGtk(profile); |
| 263 | 263 |
| 264 // Resume accessibility events. | 264 // Resume accessibility events. |
| 265 profile->ResumeAccessibilityEvents(); | 265 profile->ResumeAccessibilityEvents(); |
| 266 } | 266 } |
| 267 options_window->ShowOptionsPage(page, highlight_group); | 267 options_window->ShowOptionsPage(page, highlight_group); |
| 268 } | 268 } |
| 269 #endif // !defined(OS_CHROMEOS) | 269 #endif // !defined(OS_CHROMEOS) |
| OLD | NEW |