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

Side by Side Diff: components/content_settings/core/browser/content_settings_default_provider.cc

Issue 1442083002: Stop inheriting push notification permissions from regular to incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review nits Created 5 years 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 (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 "components/content_settings/core/browser/content_settings_default_prov ider.h" 5 #include "components/content_settings/core/browser/content_settings_default_prov ider.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 content_type, 253 content_type,
254 ResourceIdentifier()); 254 ResourceIdentifier());
255 255
256 return true; 256 return true;
257 } 257 }
258 258
259 scoped_ptr<RuleIterator> DefaultProvider::GetRuleIterator( 259 scoped_ptr<RuleIterator> DefaultProvider::GetRuleIterator(
260 ContentSettingsType content_type, 260 ContentSettingsType content_type,
261 const ResourceIdentifier& resource_identifier, 261 const ResourceIdentifier& resource_identifier,
262 bool incognito) const { 262 bool incognito) const {
263 // The default provider never has incognito-specific settings.
264 if (incognito)
265 return scoped_ptr<RuleIterator>(new EmptyRuleIterator());
266
263 base::AutoLock lock(lock_); 267 base::AutoLock lock(lock_);
264 if (resource_identifier.empty()) { 268 if (resource_identifier.empty()) {
265 auto it(default_settings_.find(content_type)); 269 auto it(default_settings_.find(content_type));
266 if (it != default_settings_.end()) 270 if (it != default_settings_.end())
267 return scoped_ptr<RuleIterator>( 271 return scoped_ptr<RuleIterator>(
268 new DefaultRuleIterator(it->second.get())); 272 new DefaultRuleIterator(it->second.get()));
269 NOTREACHED(); 273 NOTREACHED();
270 } 274 }
271 return scoped_ptr<RuleIterator>(new EmptyRuleIterator()); 275 return scoped_ptr<RuleIterator>(new EmptyRuleIterator());
272 } 276 }
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 } 374 }
371 375
372 void DefaultProvider::DiscardObsoletePreferences() { 376 void DefaultProvider::DiscardObsoletePreferences() {
373 prefs_->ClearPref(kObsoleteDefaultContentSettings); 377 prefs_->ClearPref(kObsoleteDefaultContentSettings);
374 prefs_->ClearPref(kObsoleteMigratedDefaultContentSettings); 378 prefs_->ClearPref(kObsoleteMigratedDefaultContentSettings);
375 prefs_->ClearPref(kObsoleteMigratedDefaultMediaStreamSetting); 379 prefs_->ClearPref(kObsoleteMigratedDefaultMediaStreamSetting);
376 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting); 380 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting);
377 } 381 }
378 382
379 } // namespace content_settings 383 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698