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

Side by Side Diff: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

Issue 18346006: Update OS X to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 5 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) 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 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" 5 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #import "base/mac/mac_util.h" 10 #import "base/mac/mac_util.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 CookieTreeNode* cookie = static_cast<CookieTreeNode*>([node treeNode]); 236 CookieTreeNode* cookie = static_cast<CookieTreeNode*>([node treeNode]);
237 if (cookie->GetDetailedInfo().node_type != 237 if (cookie->GetDetailedInfo().node_type !=
238 CookieTreeNode::DetailedInfo::TYPE_HOST) { 238 CookieTreeNode::DetailedInfo::TYPE_HOST) {
239 continue; 239 continue;
240 } 240 }
241 Profile* profile = 241 Profile* profile =
242 Profile::FromBrowserContext(webContents_->GetBrowserContext()); 242 Profile::FromBrowserContext(webContents_->GetBrowserContext());
243 CookieTreeHostNode* host_node = 243 CookieTreeHostNode* host_node =
244 static_cast<CookieTreeHostNode*>(cookie); 244 static_cast<CookieTreeHostNode*>(cookie);
245 host_node->CreateContentException( 245 host_node->CreateContentException(
246 CookieSettings::Factory::GetForProfile(profile), setting); 246 CookieSettings::Factory::GetForProfile(profile).get(), setting);
247 if (!lastDomain.empty()) 247 if (!lastDomain.empty())
248 multipleDomainsChanged = YES; 248 multipleDomainsChanged = YES;
249 lastDomain = host_node->GetTitle(); 249 lastDomain = host_node->GetTitle();
250 } 250 }
251 if (multipleDomainsChanged) 251 if (multipleDomainsChanged)
252 [self showInfoBarForMultipleDomainsAndSetting:setting]; 252 [self showInfoBarForMultipleDomainsAndSetting:setting];
253 else 253 else
254 [self showInfoBarForDomain:lastDomain setting:setting]; 254 [self showInfoBarForDomain:lastDomain setting:setting];
255 contentSettingsChanged_ = YES; 255 contentSettingsChanged_ = YES;
256 } 256 }
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 treeController = blockedTreeController_; 512 treeController = blockedTreeController_;
513 break; 513 break;
514 default: 514 default:
515 NOTREACHED(); 515 NOTREACHED();
516 return; 516 return;
517 } 517 }
518 [detailsViewController_ configureBindingsForTreeController:treeController]; 518 [detailsViewController_ configureBindingsForTreeController:treeController];
519 } 519 }
520 520
521 @end 521 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698