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

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

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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
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/content_setting_bubble_cocoa.h " 5 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h "
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 299
300 if (model->AsMediaStreamBubbleModel()) 300 if (model->AsMediaStreamBubbleModel())
301 nibPath = @"ContentBlockedMedia"; 301 nibPath = @"ContentBlockedMedia";
302 302
303 if (model->AsSubresourceFilterBubbleModel()) 303 if (model->AsSubresourceFilterBubbleModel())
304 nibPath = @"ContentSubresourceFilter"; 304 nibPath = @"ContentSubresourceFilter";
305 return nibPath; 305 return nibPath;
306 } 306 }
307 307
308 - (void)dealloc { 308 - (void)dealloc {
309 STLDeleteValues(&mediaMenus_); 309 base::STLDeleteValues(&mediaMenus_);
310 [super dealloc]; 310 [super dealloc];
311 } 311 }
312 312
313 - (void)initializeTitle { 313 - (void)initializeTitle {
314 if (!titleLabel_) 314 if (!titleLabel_)
315 return; 315 return;
316 316
317 NSString* label = base::SysUTF8ToNSString( 317 NSString* label = base::SysUTF8ToNSString(
318 contentSettingBubbleModel_->bubble_content().title); 318 contentSettingBubbleModel_->bubble_content().title);
319 [titleLabel_ setStringValue:label]; 319 [titleLabel_ setStringValue:label];
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index))); 858 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index)));
859 859
860 it->second->model->ExecuteCommand(index, 0); 860 it->second->model->ExecuteCommand(index, 0);
861 } 861 }
862 862
863 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus { 863 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus {
864 return &mediaMenus_; 864 return &mediaMenus_;
865 } 865 }
866 866
867 @end // ContentSettingBubbleController 867 @end // ContentSettingBubbleController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698