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

Side by Side Diff: chrome/browser/content_settings/content_settings_internal_extension_provider.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/content_settings/content_settings_internal_extension_pr ovider.h" 5 #include "chrome/browser/content_settings/content_settings_internal_extension_pr ovider.h"
6 6
7 #include "chrome/browser/content_settings/content_settings_rule.h" 7 #include "chrome/browser/content_settings/content_settings_rule.h"
8 #include "chrome/browser/extensions/extension_host.h" 8 #include "chrome/browser/extensions/extension_host.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/common/chrome_notification_types.h" 10 #include "chrome/common/chrome_notification_types.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 pattern_builder->WithPathWildcard(); 110 pattern_builder->WithPathWildcard();
111 111
112 ContentSettingsPattern primary_pattern = pattern_builder->Build(); 112 ContentSettingsPattern primary_pattern = pattern_builder->Build();
113 ContentSettingsPattern secondary_pattern = ContentSettingsPattern::Wildcard(); 113 ContentSettingsPattern secondary_pattern = ContentSettingsPattern::Wildcard();
114 { 114 {
115 base::AutoLock lock(lock_); 115 base::AutoLock lock(lock_);
116 if (setting == CONTENT_SETTING_DEFAULT) { 116 if (setting == CONTENT_SETTING_DEFAULT) {
117 value_map_.DeleteValue(primary_pattern, 117 value_map_.DeleteValue(primary_pattern,
118 secondary_pattern, 118 secondary_pattern,
119 CONTENT_SETTINGS_TYPE_PLUGINS, 119 CONTENT_SETTINGS_TYPE_PLUGINS,
120 ResourceIdentifier("")); 120 ResourceIdentifier());
121 } else { 121 } else {
122 value_map_.SetValue(primary_pattern, 122 value_map_.SetValue(primary_pattern,
123 secondary_pattern, 123 secondary_pattern,
124 CONTENT_SETTINGS_TYPE_PLUGINS, 124 CONTENT_SETTINGS_TYPE_PLUGINS,
125 ResourceIdentifier(""), 125 ResourceIdentifier(),
126 Value::CreateIntegerValue(setting)); 126 Value::CreateIntegerValue(setting));
127 } 127 }
128 } 128 }
129 NotifyObservers(primary_pattern, 129 NotifyObservers(primary_pattern,
130 secondary_pattern, 130 secondary_pattern,
131 CONTENT_SETTINGS_TYPE_PLUGINS, 131 CONTENT_SETTINGS_TYPE_PLUGINS,
132 ResourceIdentifier("")); 132 ResourceIdentifier());
133 } 133 }
134 134
135 } // namespace content_settings 135 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698