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

Side by Side Diff: chrome/browser/dom_ui/plugins_ui.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/dom_ui/options/options_ui.cc ('k') | chrome/browser/dom_ui/print_preview_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/dom_ui/plugins_ui.h" 5 #include "chrome/browser/dom_ui/plugins_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #include "app/resource_bundle.h"
13 #include "base/message_loop.h" 12 #include "base/message_loop.h"
14 #include "base/path_service.h" 13 #include "base/path_service.h"
15 #include "base/singleton.h" 14 #include "base/singleton.h"
16 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
17 #include "base/values.h" 16 #include "base/values.h"
18 #include "chrome/browser/browser_thread.h" 17 #include "chrome/browser/browser_thread.h"
19 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 18 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
20 #include "chrome/browser/plugin_updater.h" 19 #include "chrome/browser/plugin_updater.h"
21 #include "chrome/browser/prefs/pref_service.h" 20 #include "chrome/browser/prefs/pref_service.h"
22 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/tab_contents/tab_contents.h" 22 #include "chrome/browser/tab_contents/tab_contents.h"
24 #include "chrome/browser/ui/browser.h" 23 #include "chrome/browser/ui/browser.h"
25 #include "chrome/browser/ui/browser_window.h" 24 #include "chrome/browser/ui/browser_window.h"
26 #include "chrome/common/chrome_paths.h" 25 #include "chrome/common/chrome_paths.h"
27 #include "chrome/common/jstemplate_builder.h" 26 #include "chrome/common/jstemplate_builder.h"
28 #include "chrome/common/notification_service.h" 27 #include "chrome/common/notification_service.h"
29 #include "chrome/common/pepper_plugin_registry.h" 28 #include "chrome/common/pepper_plugin_registry.h"
30 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
31 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
32 #include "grit/browser_resources.h" 31 #include "grit/browser_resources.h"
33 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
34 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 #include "ui/base/resource/resource_bundle.h"
35 #include "webkit/plugins/npapi/plugin_list.h" 35 #include "webkit/plugins/npapi/plugin_list.h"
36 36
37 namespace { 37 namespace {
38 38
39 /////////////////////////////////////////////////////////////////////////////// 39 ///////////////////////////////////////////////////////////////////////////////
40 // 40 //
41 // PluginsHTMLSource 41 // PluginsHTMLSource
42 // 42 //
43 /////////////////////////////////////////////////////////////////////////////// 43 ///////////////////////////////////////////////////////////////////////////////
44 44
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 void PluginsUI::RegisterUserPrefs(PrefService* prefs) { 331 void PluginsUI::RegisterUserPrefs(PrefService* prefs) {
332 FilePath internal_dir; 332 FilePath internal_dir;
333 PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir); 333 PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir);
334 prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory, 334 prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,
335 internal_dir); 335 internal_dir);
336 336
337 prefs->RegisterListPref(prefs::kPluginsPluginsBlacklist); 337 prefs->RegisterListPref(prefs::kPluginsPluginsBlacklist);
338 prefs->RegisterListPref(prefs::kPluginsPluginsList); 338 prefs->RegisterListPref(prefs::kPluginsPluginsList);
339 prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF, false); 339 prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF, false);
340 } 340 }
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options/options_ui.cc ('k') | chrome/browser/dom_ui/print_preview_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698