Pepper Flash settings integration: add UI for "deauthorize content licenses".

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 2366 matching lines @@
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kDeleteCookies,
                              true,
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kDeletePasswords,
                              false,
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kDeleteFormData,
                              false,
                              PrefService::SYNCABLE_PREF);
+  prefs->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses,

[sky, 2012/05/21 20:47:50]

Why is this in browser and not some where closer to pepper/flash?

[yzshen1, 2012/05/21 20:53:20]

This option item is displayed in the "Clear browsing data" dialog along with the
six prefs above (line 2369-2386). So I thought it makes sense to put them
together. Similarly kPepperFlashSettingsEnabled is used together with
kClearPluginLSODataEnabled, so I put it in this file as well.

Do you think that is okay? Thanks!

[yzshen1, 2012/05/21 22:14:41]

Done.

+                             false,
+                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod,
                              0,
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser,
                              true,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint,
                              true,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop,
@@ skipping 62 matching lines @@
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing,
                              true,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kEnableReferrers,
                              true,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled,
                              true,
                              PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled,
+                             true,
+                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kEnableMemoryInfo,
                              false,
                              PrefService::UNSYNCABLE_PREF);
 
   // Initialize the disk cache prefs.
   prefs->RegisterFilePathPref(prefs::kDiskCacheDir,
                               FilePath(),
                               PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kDiskCacheSize,
                              0,
@@ skipping 2984 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }