Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/location_bar_view_mac.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/nsimage_cache_mac.h"
@@ skipping 474 matching lines @@
       [field_ updateCursorAndToolTipRects];
       [field_ setNeedsDisplay:YES];
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification";
       break;
   }
 }
 
-void LocationBarViewMac::PostNotification(const NSString* notification) {
+void LocationBarViewMac::PostNotification(NSString* notification) {
   [[NSNotificationCenter defaultCenter] postNotificationName:notification
                                         object:[NSValue valueWithPointer:this]];
 }
 
 void LocationBarViewMac::RefreshContentSettingsViews() {
   const TabContents* tab_contents = browser_->GetSelectedTabContents();
   for (ContentSettingViews::iterator it(content_setting_views_.begin());
       it != content_setting_views_.end();
       ++it) {
     (*it)->UpdateFromTabContents(
@@ skipping 112 matching lines @@
     SetImage(AutocompleteEditViewMac::ImageForResource(IDR_OMNIBOX_STAR));
     tooltip_.reset(
         [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STAR) retain]);
   }
 }
 
 void LocationBarViewMac::StarIconView::OnMousePressed(NSRect bounds) {
   command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
 }
 
-const NSString* LocationBarViewMac::StarIconView::GetToolTip() {
+NSString* LocationBarViewMac::StarIconView::GetToolTip() {
   return tooltip_.get();
 }
 
 // PageActionImageView----------------------------------------------------------
 
 LocationBarViewMac::PageActionImageView::PageActionImageView(
     LocationBarViewMac* owner,
     Profile* profile,
     ExtensionAction* page_action)
     : owner_(owner),
@@ skipping 145 matching lines @@
 }
 
 void LocationBarViewMac::PageActionImageView::SetToolTip(std::string tooltip) {
   if (tooltip.empty()) {
     SetToolTip(nil);
     return;
   }
   SetToolTip(base::SysUTF8ToNSString(tooltip));
 }
 
-const NSString* LocationBarViewMac::PageActionImageView::GetToolTip() {
+NSString* LocationBarViewMac::PageActionImageView::GetToolTip() {
   return tooltip_.get();
 }
 
 NSMenu* LocationBarViewMac::PageActionImageView::GetMenu() {
   if (!profile_)
     return nil;
   ExtensionsService* service = profile_->GetExtensionsService();
   if (!service)
     return nil;
   Extension* extension = service->GetExtensionById(
@@ skipping 62 matching lines @@
   // Open bubble.
   ContentSettingBubbleModel* model =
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
           tabContents, profile_,
           content_setting_image_model_->get_content_settings_type());
   [[ContentBlockedBubbleController showForModel:model
                                    parentWindow:window
                                      anchoredAt:anchor] showWindow:nil];
 }
 
-const NSString* LocationBarViewMac::ContentSettingImageView::GetToolTip() {
+NSString* LocationBarViewMac::ContentSettingImageView::GetToolTip() {
   return tooltip_.get();
 }
 
 void LocationBarViewMac::ContentSettingImageView::UpdateFromTabContents(
     const TabContents* tab_contents) {
   content_setting_image_model_->UpdateFromTabContents(tab_contents);
   if (content_setting_image_model_->is_visible()) {
     // TODO(thakis): We should use pdfs for these icons on OSX.
     // http://crbug.com/35847
     SetIcon(content_setting_image_model_->get_icon());
@@ skipping 77 matching lines @@
       ++result;
   }
   return result;
 }
 
 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame,
                                                             size_t index) {
   ViewAt(index)->OnMousePressed(iconFrame);
 }