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

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 12089015: Fix post commit comments for CL 11896028. Only nits. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/content_settings/content_setting_image_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index af7ed80e3cb09980b247ab154c8b8524b2303b1a..26c8599f3b299b8624bf8526fbf5d57bf8ecd4d9 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -595,7 +595,7 @@ void ContentSettingMediaStreamBubbleModel::UpdateSettings(
profile()->GetHostContentSettingsMap();
// The same patterns must be used as in other places (e.g. the infobar) in
// order to override the existing rule. Otherwise a new rule is created.
- // TODO(markusheintz): Extract to a helper so thath there is only a single
+ // TODO(markusheintz): Extract to a helper so that there is only a single
// place to touch.
ContentSettingsPattern primary_pattern =
ContentSettingsPattern::FromURLNoWildcard(web_contents()->GetURL());
@@ -603,10 +603,10 @@ void ContentSettingMediaStreamBubbleModel::UpdateSettings(
ContentSettingsPattern::Wildcard();
content_settings->SetContentSetting(
primary_pattern, secondary_pattern,
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "", setting);
+ CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), setting);
content_settings->SetContentSetting(
primary_pattern, secondary_pattern,
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "", setting);
+ CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), setting);
}
}
« no previous file with comments | « no previous file | chrome/browser/ui/content_settings/content_setting_image_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698