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 <gtk/gtk.h> | 5 #include <gtk/gtk.h> |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
10 #include "chrome/browser/accessibility_events.h" | 10 #include "chrome/browser/accessibility_events.h" |
11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" | 12 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" |
13 #include "chrome/browser/gtk/gtk_util.h" | 13 #include "chrome/browser/gtk/gtk_util.h" |
14 #include "chrome/browser/gtk/options/advanced_page_gtk.h" | 14 #include "chrome/browser/gtk/options/advanced_page_gtk.h" |
15 #include "chrome/browser/gtk/options/content_page_gtk.h" | 15 #include "chrome/browser/gtk/options/content_page_gtk.h" |
16 #include "chrome/browser/gtk/options/general_page_gtk.h" | 16 #include "chrome/browser/gtk/options/general_page_gtk.h" |
17 #include "chrome/browser/prefs/pref_member.h" | 17 #include "chrome/browser/prefs/pref_member.h" |
18 #include "chrome/browser/prefs/pref_service.h" | 18 #include "chrome/browser/prefs/pref_service.h" |
19 #include "chrome/browser/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/ui/browser_list.h" | 20 #include "chrome/browser/ui/browser_list.h" |
21 #include "chrome/browser/ui/browser_window.h" | 21 #include "chrome/browser/ui/browser_window.h" |
22 #include "chrome/browser/ui/options/options_window.h" | 22 #include "chrome/browser/ui/options/options_window.h" |
23 #include "chrome/browser/ui/window_sizer.h" | 23 #include "chrome/browser/ui/window_sizer.h" |
24 #include "chrome/common/notification_service.h" | 24 #include "chrome/common/notification_service.h" |
25 #include "chrome/common/pref_names.h" | 25 #include "chrome/common/pref_names.h" |
26 #include "grit/chromium_strings.h" | 26 #include "grit/chromium_strings.h" |
27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
28 | 28 |
29 #if defined(OS_CHROMEOS) | 29 #if defined(OS_CHROMEOS) |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
259 | 259 |
260 // Create the options window. | 260 // Create the options window. |
261 options_window = new OptionsWindowGtk(profile); | 261 options_window = new OptionsWindowGtk(profile); |
262 | 262 |
263 // Resume accessibility events. | 263 // Resume accessibility events. |
264 profile->ResumeAccessibilityEvents(); | 264 profile->ResumeAccessibilityEvents(); |
265 } | 265 } |
266 options_window->ShowOptionsPage(page, highlight_group); | 266 options_window->ShowOptionsPage(page, highlight_group); |
267 } | 267 } |
268 #endif // !defined(OS_CHROMEOS) | 268 #endif // !defined(OS_CHROMEOS) |
OLD | NEW |