Generate and connect a Pepper identifier for Chrome OS

chrome/browser/chromeos/preferences.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/chromeos/preferences.h"
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/histogram.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
+#include "chrome/browser/chromeos/system/drm_settings.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chrome/browser/chromeos/system/screen_locker_settings.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 216 matching lines @@
                              true,
                              PrefService::UNSYNCABLE_PREF);
 
   // OAuth1 all access token and secret pair.
   prefs->RegisterStringPref(prefs::kOAuth1Token,
                             "",
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kOAuth1Secret,
                             "",
                             PrefService::UNSYNCABLE_PREF);
+
+  // TODO(wad): Once UI is connected, a final default can be set. At that point
+  // change this pref from UNSYNCABLE to SYNCABLE.
+  prefs->RegisterBooleanPref(prefs::kEnableCrosDRM,
+                             true,
+                             PrefService::UNSYNCABLE_PREF);
 }
 
 // static
 void Preferences::SetDefaultOSSettings() {
   system::touchpad_settings::SetTapToClick(kDefaultTapToClickEnabled);
   ui::SetNaturalScroll(kDefaultNaturalScrollEnabled);
 }
 
 void Preferences::InitUserPrefs(PrefService* prefs) {
   tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this);
@@ skipping 63 matching lines @@
   xkb_remap_alt_key_to_.Init(
       prefs::kLanguageXkbRemapAltKeyTo, prefs, this);
   xkb_auto_repeat_enabled_.Init(
       prefs::kLanguageXkbAutoRepeatEnabled, prefs, this);
   xkb_auto_repeat_delay_pref_.Init(
       prefs::kLanguageXkbAutoRepeatDelay, prefs, this);
   xkb_auto_repeat_interval_pref_.Init(
       prefs::kLanguageXkbAutoRepeatInterval, prefs, this);
 
   enable_screen_lock_.Init(prefs::kEnableScreenLock, prefs, this);
+
+  enable_drm_.Init(prefs::kEnableCrosDRM, prefs, this);
 }
 
 void Preferences::Init(PrefService* prefs) {
   InitUserPrefs(prefs);
 
   // Initialize preferences to currently saved state.
   NotifyPrefChanged(NULL);
 
   // Initialize virtual keyboard settings to currently saved state.
   UpdateVirturalKeyboardPreference(prefs);
@@ skipping 208 matching lines @@
           language_prefs::kMozcIntegerPrefs[i].ibus_config_name,
           mozc_integer_prefs_[i].GetValue());
     }
   }
 
   // Init or update power manager config.
   if (!pref_name || *pref_name == prefs::kEnableScreenLock) {
     system::screen_locker_settings::EnableScreenLock(
         enable_screen_lock_.GetValue());
   }
+
+  // Init or update protected content (DRM) support.
+  if (!pref_name || *pref_name == prefs::kEnableCrosDRM) {
+    system::drm_settings::ToggleDrm(

[brettw, 2012/05/03 20:34:21]

This should fit on one line.

[Will Drewry, 2012/05/03 21:58:49]

Done.

+        enable_drm_.GetValue());
+  }
+
 }
 
 void Preferences::SetLanguageConfigBoolean(const char* section,
                                            const char* name,
                                            bool value) {
   input_method::InputMethodConfigValue config;
   config.type = input_method::InputMethodConfigValue::kValueTypeBool;
   config.bool_value = value;
   input_method_manager_->SetInputMethodConfig(section, name, config);
 }
@@ skipping 134 matching lines @@
 
   // Remove invalid prefs.
   DictionaryPrefUpdate updater(prefs, prefs::kLanguagePreferredVirtualKeyboard);
   DictionaryValue* pref_value = updater.Get();
   for (size_t i = 0; i < layouts_to_remove.size(); ++i) {
     pref_value->RemoveWithoutPathExpansion(layouts_to_remove[i], NULL);
   }
 }
 
 }  // namespace chromeos