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

Side by Side Diff: chrome/browser/prefs/pref_service_syncable_util.cc

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: . Created 3 years, 8 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/prefs/pref_service_syncable_util.h" 5 #include "chrome/browser/prefs/pref_service_syncable_util.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 18 matching lines...) Expand all
29 } 29 }
30 30
31 sync_preferences::PrefServiceSyncable* CreateIncognitoPrefServiceSyncable( 31 sync_preferences::PrefServiceSyncable* CreateIncognitoPrefServiceSyncable(
32 sync_preferences::PrefServiceSyncable* pref_service, 32 sync_preferences::PrefServiceSyncable* pref_service,
33 PrefStore* incognito_extension_pref_store) { 33 PrefStore* incognito_extension_pref_store) {
34 // List of keys that cannot be changed in the user prefs file by the incognito 34 // List of keys that cannot be changed in the user prefs file by the incognito
35 // profile. All preferences that store information about the browsing history 35 // profile. All preferences that store information about the browsing history
36 // or behavior of the user should have this property. 36 // or behavior of the user should have this property.
37 std::vector<const char*> overlay_pref_names; 37 std::vector<const char*> overlay_pref_names;
38 overlay_pref_names.push_back(prefs::kBrowserWindowPlacement); 38 overlay_pref_names.push_back(prefs::kBrowserWindowPlacement);
39 #if defined(ENABLE_MEDIA_ROUTER)
40 overlay_pref_names.push_back(prefs::kMediaRouterTabMirroringSources); 39 overlay_pref_names.push_back(prefs::kMediaRouterTabMirroringSources);
41 #endif
42 overlay_pref_names.push_back(prefs::kSaveFileDefaultDirectory); 40 overlay_pref_names.push_back(prefs::kSaveFileDefaultDirectory);
43 #if defined(OS_ANDROID) 41 #if defined(OS_ANDROID)
44 overlay_pref_names.push_back(proxy_config::prefs::kProxy); 42 overlay_pref_names.push_back(proxy_config::prefs::kProxy);
45 #endif 43 #endif
46 return pref_service->CreateIncognitoPrefService( 44 return pref_service->CreateIncognitoPrefService(
47 incognito_extension_pref_store, overlay_pref_names); 45 incognito_extension_pref_store, overlay_pref_names);
48 } 46 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698