chrome/browser/gtk/options/options_window_gtk.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 months 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

« no previous file with comments | « chrome/browser/gtk/options/managed_prefs_banner_gtk.h ('k') | chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc » ('j') | chrome/chrome_browser.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

11 #include "base/scoped_ptr.h"	11 #include "base/scoped_ptr.h"

12 #include "chrome/browser/accessibility_events.h"	12 #include "chrome/browser/accessibility_events.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/browser_window.h"	15 #include "chrome/browser/browser_window.h"

16 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"	16 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"

17 #include "chrome/browser/gtk/gtk_util.h"	17 #include "chrome/browser/gtk/gtk_util.h"

18 #include "chrome/browser/gtk/options/advanced_page_gtk.h"	18 #include "chrome/browser/gtk/options/advanced_page_gtk.h"

19 #include "chrome/browser/gtk/options/content_page_gtk.h"	19 #include "chrome/browser/gtk/options/content_page_gtk.h"

20 #include "chrome/browser/gtk/options/general_page_gtk.h"	20 #include "chrome/browser/gtk/options/general_page_gtk.h"

21 #include "chrome/browser/pref_member.h"	21 #include "chrome/browser/prefs/pref_member.h"

22 #include "chrome/browser/pref_service.h"	22 #include "chrome/browser/prefs/pref_service.h"

23 #include "chrome/browser/profile.h"	23 #include "chrome/browser/profile.h"

24 #include "chrome/browser/window_sizer.h"	24 #include "chrome/browser/window_sizer.h"

25 #include "chrome/common/notification_service.h"	25 #include "chrome/common/notification_service.h"

26 #include "chrome/common/pref_names.h"	26 #include "chrome/common/pref_names.h"

27 #include "grit/chromium_strings.h"	27 #include "grit/chromium_strings.h"

28 #include "grit/generated_resources.h"	28 #include "grit/generated_resources.h"

29	29

30 #if defined(OS_CHROMEOS)	30 #if defined(OS_CHROMEOS)

31 #include "chrome/browser/chromeos/options/internet_page_view.h"	31 #include "chrome/browser/chromeos/options/internet_page_view.h"

32 #include "chrome/browser/chromeos/options/system_page_view.h"	32 #include "chrome/browser/chromeos/options/system_page_view.h"

(...skipping 227 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