chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/bidi_checker_web_ui_test.cc ('k') | chrome/browser/ui/webui/chromeos/drive_internals_ui.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/ui/webui/chrome_web_ui_controller_factory.h"	5 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/location.h"	9 #include "base/location.h"

10 #include "base/message_loop_proxy.h"	10 #include "base/message_loop_proxy.h"

	11 #include "base/prefs/pref_service.h"

11 #include "chrome/browser/about_flags.h"	12 #include "chrome/browser/about_flags.h"

12 #include "chrome/browser/extensions/extension_service.h"	13 #include "chrome/browser/extensions/extension_service.h"

13 #include "chrome/browser/extensions/extension_web_ui.h"	14 #include "chrome/browser/extensions/extension_web_ui.h"

14 #include "chrome/browser/history/history_types.h"	15 #include "chrome/browser/history/history_types.h"

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

16 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/profiles/profile_manager.h"	17 #include "chrome/browser/profiles/profile_manager.h"

18 #include "chrome/browser/ui/webui/about_ui.h"	18 #include "chrome/browser/ui/webui/about_ui.h"

19 #include "chrome/browser/ui/webui/bookmarks_ui.h"	19 #include "chrome/browser/ui/webui/bookmarks_ui.h"

20 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"	20 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"

21 #include "chrome/browser/ui/webui/crashes_ui.h"	21 #include "chrome/browser/ui/webui/crashes_ui.h"

22 #include "chrome/browser/ui/webui/devtools_ui.h"	22 #include "chrome/browser/ui/webui/devtools_ui.h"

23 #include "chrome/browser/ui/webui/downloads_ui.h"	23 #include "chrome/browser/ui/webui/downloads_ui.h"

24 #include "chrome/browser/ui/webui/extensions/extension_activity_ui.h"	24 #include "chrome/browser/ui/webui/extensions/extension_activity_ui.h"

25 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"	25 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"

(...skipping 533 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
559 if (page_url.host() == chrome::kChromeUISettingsFrameHost)	559 if (page_url.host() == chrome::kChromeUISettingsFrameHost)

560 return options::OptionsUI::GetFaviconResourceBytes(scale_factor);	560 return options::OptionsUI::GetFaviconResourceBytes(scale_factor);

561	561

562 // Android doesn't use the plugins pages.	562 // Android doesn't use the plugins pages.

563 if (page_url.host() == chrome::kChromeUIPluginsHost)	563 if (page_url.host() == chrome::kChromeUIPluginsHost)

564 return PluginsUI::GetFaviconResourceBytes(scale_factor);	564 return PluginsUI::GetFaviconResourceBytes(scale_factor);

565 #endif	565 #endif

566	566

567 return NULL;	567 return NULL;

568 }	568 }

OLD	NEW