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

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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
OLDNEW
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/plugins_ui.h" 5 #include "chrome/browser/ui/webui/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
(...skipping 22 matching lines...) Expand all
33 #include "chrome/common/pref_names.h" 33 #include "chrome/common/pref_names.h"
34 #include "chrome/common/url_constants.h" 34 #include "chrome/common/url_constants.h"
35 #include "content/public/browser/notification_source.h" 35 #include "content/public/browser/notification_source.h"
36 #include "content/public/browser/plugin_service.h" 36 #include "content/public/browser/plugin_service.h"
37 #include "content/public/browser/web_contents.h" 37 #include "content/public/browser/web_contents.h"
38 #include "content/public/browser/web_ui.h" 38 #include "content/public/browser/web_ui.h"
39 #include "content/public/browser/web_ui_message_handler.h" 39 #include "content/public/browser/web_ui_message_handler.h"
40 #include "grit/browser_resources.h" 40 #include "grit/browser_resources.h"
41 #include "grit/generated_resources.h" 41 #include "grit/generated_resources.h"
42 #include "grit/theme_resources.h" 42 #include "grit/theme_resources.h"
43 #include "grit/theme_resources_standard.h"
44 #include "ui/base/l10n/l10n_util.h" 43 #include "ui/base/l10n/l10n_util.h"
45 #include "ui/base/layout.h" 44 #include "ui/base/layout.h"
46 #include "ui/base/resource/resource_bundle.h" 45 #include "ui/base/resource/resource_bundle.h"
47 #include "webkit/plugins/npapi/plugin_group.h" 46 #include "webkit/plugins/npapi/plugin_group.h"
48 47
49 #if defined(OS_CHROMEOS) 48 #if defined(OS_CHROMEOS)
50 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h" 49 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
51 #endif 50 #endif
52 51
53 #if defined(ENABLE_PLUGIN_INSTALLATION) 52 #if defined(ENABLE_PLUGIN_INSTALLATION)
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 void PluginsUI::RegisterUserPrefs(PrefService* prefs) { 491 void PluginsUI::RegisterUserPrefs(PrefService* prefs) {
493 prefs->RegisterBooleanPref(prefs::kPluginsShowDetails, 492 prefs->RegisterBooleanPref(prefs::kPluginsShowDetails,
494 false, 493 false,
495 PrefService::UNSYNCABLE_PREF); 494 PrefService::UNSYNCABLE_PREF);
496 prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar, 495 prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar,
497 true, 496 true,
498 PrefService::UNSYNCABLE_PREF); 497 PrefService::UNSYNCABLE_PREF);
499 prefs->RegisterDictionaryPref(prefs::kContentSettingsPluginWhitelist, 498 prefs->RegisterDictionaryPref(prefs::kContentSettingsPluginWhitelist,
500 PrefService::SYNCABLE_PREF); 499 PrefService::SYNCABLE_PREF);
501 } 500 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options2/options_ui.cc ('k') | chrome/browser/ui/webui/shared_resources_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698