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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index d545ba3be8b2c47d73cd349e7f6d9b03e9b9f69a..017a8182be2c7b8ef702639c45443925469bae49 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1685,7 +1685,7 @@ void ChromeContentBrowserClient::RequestDesktopNotificationPermission(
for (ExtensionSet::const_iterator iter = extensions.begin();
iter != extensions.end(); ++iter) {
if (notification_service->IsExtensionEnabled((*iter)->id())) {
- extension = *iter;
+ extension = iter->get();
break;
}
}
@@ -1978,7 +1978,7 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
#else
// The user stylesheet watcher may not exist in a testing profile.
UserStyleSheetWatcher* user_style_sheet_watcher =
- UserStyleSheetWatcherFactory::GetForProfile(profile);
+ UserStyleSheetWatcherFactory::GetForProfile(profile).get();
if (user_style_sheet_watcher) {
web_prefs->user_style_sheet_enabled = true;
web_prefs->user_style_sheet_location =
« no previous file with comments | « chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc ('k') | chrome/browser/chrome_plugin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698