Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Side by Side Diff: chrome/browser/gtk/options/options_window_gtk.cc

Issue 5582002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
6
7 #include <gtk/gtk.h> 5 #include <gtk/gtk.h>
8 6
9 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
10 #include "base/message_loop.h" 8 #include "base/message_loop.h"
11 #include "base/scoped_ptr.h" 9 #include "base/scoped_ptr.h"
12 #include "chrome/browser/accessibility_events.h" 10 #include "chrome/browser/accessibility_events.h"
13 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" 12 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
15 #include "chrome/browser/gtk/gtk_util.h" 13 #include "chrome/browser/gtk/gtk_util.h"
16 #include "chrome/browser/gtk/options/advanced_page_gtk.h" 14 #include "chrome/browser/gtk/options/advanced_page_gtk.h"
17 #include "chrome/browser/gtk/options/content_page_gtk.h" 15 #include "chrome/browser/gtk/options/content_page_gtk.h"
18 #include "chrome/browser/gtk/options/general_page_gtk.h" 16 #include "chrome/browser/gtk/options/general_page_gtk.h"
19 #include "chrome/browser/prefs/pref_member.h" 17 #include "chrome/browser/prefs/pref_member.h"
20 #include "chrome/browser/prefs/pref_service.h" 18 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/profile.h" 19 #include "chrome/browser/profile.h"
22 #include "chrome/browser/ui/browser_list.h" 20 #include "chrome/browser/ui/browser_list.h"
23 #include "chrome/browser/ui/browser_window.h" 21 #include "chrome/browser/ui/browser_window.h"
22 #include "chrome/browser/ui/options/options_window.h"
24 #include "chrome/browser/ui/window_sizer.h" 23 #include "chrome/browser/ui/window_sizer.h"
25 #include "chrome/common/notification_service.h" 24 #include "chrome/common/notification_service.h"
26 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
27 #include "grit/chromium_strings.h" 26 #include "grit/chromium_strings.h"
28 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
29 28
30 #if defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
31 #include "chrome/browser/chromeos/options/internet_page_view.h" 30 #include "chrome/browser/chromeos/options/internet_page_view.h"
32 #include "chrome/browser/chromeos/options/system_page_view.h" 31 #include "chrome/browser/chromeos/options/system_page_view.h"
33 #endif 32 #endif
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 259
261 // Create the options window. 260 // Create the options window.
262 options_window = new OptionsWindowGtk(profile); 261 options_window = new OptionsWindowGtk(profile);
263 262
264 // Resume accessibility events. 263 // Resume accessibility events.
265 profile->ResumeAccessibilityEvents(); 264 profile->ResumeAccessibilityEvents();
266 } 265 }
267 options_window->ShowOptionsPage(page, highlight_group); 266 options_window->ShowOptionsPage(page, highlight_group);
268 } 267 }
269 #endif // !defined(OS_CHROMEOS) 268 #endif // !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/gtk/options/languages_page_gtk.h ('k') | chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698