OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 // Allow browser windows to go in front of the options dialog in metacity. | 99 // Allow browser windows to go in front of the options dialog in metacity. |
100 gtk_window_set_type_hint(GTK_WINDOW(dialog_), GDK_WINDOW_TYPE_HINT_NORMAL); | 100 gtk_window_set_type_hint(GTK_WINDOW(dialog_), GDK_WINDOW_TYPE_HINT_NORMAL); |
101 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox), | 101 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox), |
102 gtk_util::kContentAreaSpacing); | 102 gtk_util::kContentAreaSpacing); |
103 | 103 |
104 notebook_ = gtk_notebook_new(); | 104 notebook_ = gtk_notebook_new(); |
105 | 105 |
106 #if defined(OS_CHROMEOS) | 106 #if defined(OS_CHROMEOS) |
107 gtk_notebook_append_page( | 107 gtk_notebook_append_page( |
108 GTK_NOTEBOOK(notebook_), | 108 GTK_NOTEBOOK(notebook_), |
109 (new SettingsPageView(profile_))->WrapInGtkWidget(), | 109 (new chromeos::SettingsPageView(profile_))->WrapInGtkWidget(), |
110 gtk_label_new( | 110 gtk_label_new( |
111 l10n_util::GetStringUTF8(IDS_PRODUCT_OS_NAME).c_str())); | 111 l10n_util::GetStringUTF8(IDS_PRODUCT_OS_NAME).c_str())); |
112 #endif | 112 #endif |
113 | 113 |
114 gtk_notebook_append_page( | 114 gtk_notebook_append_page( |
115 GTK_NOTEBOOK(notebook_), | 115 GTK_NOTEBOOK(notebook_), |
116 general_page_.get_page_widget(), | 116 general_page_.get_page_widget(), |
117 gtk_label_new( | 117 gtk_label_new( |
118 l10n_util::GetStringUTF8(IDS_OPTIONS_GENERAL_TAB_LABEL).c_str())); | 118 l10n_util::GetStringUTF8(IDS_OPTIONS_GENERAL_TAB_LABEL).c_str())); |
119 | 119 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 OptionsGroup highlight_group, | 200 OptionsGroup highlight_group, |
201 Profile* profile) { | 201 Profile* profile) { |
202 DCHECK(profile); | 202 DCHECK(profile); |
203 // If there's already an existing options window, activate it and switch to | 203 // If there's already an existing options window, activate it and switch to |
204 // the specified page. | 204 // the specified page. |
205 if (!options_window) { | 205 if (!options_window) { |
206 options_window = new OptionsWindowGtk(profile); | 206 options_window = new OptionsWindowGtk(profile); |
207 } | 207 } |
208 options_window->ShowOptionsPage(page, highlight_group); | 208 options_window->ShowOptionsPage(page, highlight_group); |
209 } | 209 } |
OLD | NEW |