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

Side by Side Diff: chrome/browser/chromeos/preferences.cc

Issue 7976025: Revert 102113 - Aura: Use extension-based file picker from CrOS for pure-views builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chromeos/preferences.h" 5 #include "chrome/browser/chromeos/preferences.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/i18n/time_formatting.h" 8 #include "base/i18n/time_formatting.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/string_split.h" 10 #include "base/string_split.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 // Mobile plan notifications default to on. 188 // Mobile plan notifications default to on.
189 prefs->RegisterBooleanPref(prefs::kShowPlanNotifications, 189 prefs->RegisterBooleanPref(prefs::kShowPlanNotifications,
190 true, 190 true,
191 PrefService::SYNCABLE_PREF); 191 PrefService::SYNCABLE_PREF);
192 192
193 // 3G first-time usage promo will be shown at least once. 193 // 3G first-time usage promo will be shown at least once.
194 prefs->RegisterBooleanPref(prefs::kShow3gPromoNotification, 194 prefs->RegisterBooleanPref(prefs::kShow3gPromoNotification,
195 true, 195 true,
196 PrefService::UNSYNCABLE_PREF); 196 PrefService::UNSYNCABLE_PREF);
197 197
198 // The map of timestamps of the last used file browser handlers.
199 prefs->RegisterDictionaryPref(prefs::kLastUsedFileBrowserHandlers,
200 PrefService::UNSYNCABLE_PREF);
201
198 // Use shared proxies default to off. 202 // Use shared proxies default to off.
199 prefs->RegisterBooleanPref(prefs::kUseSharedProxies, 203 prefs->RegisterBooleanPref(prefs::kUseSharedProxies,
200 false, 204 false,
201 PrefService::SYNCABLE_PREF); 205 PrefService::SYNCABLE_PREF);
202 206
203 // OAuth1 all access token and secret pair. 207 // OAuth1 all access token and secret pair.
204 prefs->RegisterStringPref(prefs::kOAuth1Token, 208 prefs->RegisterStringPref(prefs::kOAuth1Token,
205 "", 209 "",
206 PrefService::UNSYNCABLE_PREF); 210 PrefService::UNSYNCABLE_PREF);
207 prefs->RegisterStringPref(prefs::kOAuth1Secret, 211 prefs->RegisterStringPref(prefs::kOAuth1Secret,
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 602
599 // Remove invalid prefs. 603 // Remove invalid prefs.
600 DictionaryPrefUpdate updater(prefs, prefs::kLanguagePreferredVirtualKeyboard); 604 DictionaryPrefUpdate updater(prefs, prefs::kLanguagePreferredVirtualKeyboard);
601 DictionaryValue* pref_value = updater.Get(); 605 DictionaryValue* pref_value = updater.Get();
602 for (size_t i = 0; i < layouts_to_remove.size(); ++i) { 606 for (size_t i = 0; i < layouts_to_remove.size(); ++i) {
603 pref_value->RemoveWithoutPathExpansion(layouts_to_remove[i], NULL); 607 pref_value->RemoveWithoutPathExpansion(layouts_to_remove[i], NULL);
604 } 608 }
605 } 609 }
606 610
607 } // namespace chromeos 611 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/extensions/extension_file_browser_private_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698