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

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

Issue 10909187: Use the new favicon resources below common/, delete the old assets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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/flags_ui.cc ('k') | no next file » | 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) 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 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 487
488 // Set up the chrome://plugins/ source. 488 // Set up the chrome://plugins/ source.
489 Profile* profile = Profile::FromWebUI(web_ui); 489 Profile* profile = Profile::FromWebUI(web_ui);
490 ChromeURLDataManager::AddDataSource(profile, CreatePluginsUIHTMLSource()); 490 ChromeURLDataManager::AddDataSource(profile, CreatePluginsUIHTMLSource());
491 } 491 }
492 492
493 // static 493 // static
494 base::RefCountedMemory* PluginsUI::GetFaviconResourceBytes( 494 base::RefCountedMemory* PluginsUI::GetFaviconResourceBytes(
495 ui::ScaleFactor scale_factor) { 495 ui::ScaleFactor scale_factor) {
496 return ResourceBundle::GetSharedInstance(). 496 return ResourceBundle::GetSharedInstance().
497 LoadDataResourceBytes(IDR_PLUGIN, scale_factor); 497 LoadDataResourceBytes(IDR_PLUGINS_FAVICON, scale_factor);
498 } 498 }
499 499
500 // static 500 // static
501 void PluginsUI::RegisterUserPrefs(PrefService* prefs) { 501 void PluginsUI::RegisterUserPrefs(PrefService* prefs) {
502 prefs->RegisterBooleanPref(prefs::kPluginsShowDetails, 502 prefs->RegisterBooleanPref(prefs::kPluginsShowDetails,
503 false, 503 false,
504 PrefService::UNSYNCABLE_PREF); 504 PrefService::UNSYNCABLE_PREF);
505 prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar, 505 prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar,
506 true, 506 true,
507 PrefService::UNSYNCABLE_PREF); 507 PrefService::UNSYNCABLE_PREF);
508 prefs->RegisterDictionaryPref(prefs::kContentSettingsPluginWhitelist, 508 prefs->RegisterDictionaryPref(prefs::kContentSettingsPluginWhitelist,
509 PrefService::SYNCABLE_PREF); 509 PrefService::SYNCABLE_PREF);
510 } 510 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/flags_ui.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698