Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/location_bar_view_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
 #define CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
 
 #include <string>
 #include <map>
 #include <vector>
@@ skipping 145 matching lines @@
     void SetIcon(int resource_id);
 
     // Sets the label text, font, and color. |text| may be nil; |color| and
     // |font| are ignored if |text| is nil.
     void SetLabel(NSString* text, NSFont* baseFont, NSColor* color);
 
     // Sets the visibility. SetImage() should be called with a valid image
     // before the visibility is set to |true|.
     void SetVisible(bool visible);
 
-    const NSImage* GetImage() const { return image_; }
-    const NSAttributedString* GetLabel() const { return label_; }
+    NSImage* GetImage() const { return image_; }
+    NSAttributedString* GetLabel() const { return label_; }
     bool IsVisible() const { return visible_; }
 
     // Default size when no image is present.
     virtual NSSize GetDefaultImageSize() const;
 
     // Returns the size of the image, else the default size.
     NSSize GetImageSize() const;
 
     // Returns the tooltip for this image view or |nil| if there is none.
-    virtual const NSString* GetToolTip() { return nil; }
+    virtual NSString* GetToolTip() { return nil; }
 
     // Used to determinate if the item can act as a drag source.
     virtual bool IsDraggable() { return false; }
 
     // The drag pasteboard to use if a drag is initiated.
     virtual NSPasteboard* GetDragPasteboard() { return nil; }
 
     // Called on mouse down.
     virtual void OnMousePressed(NSRect bounds) {}
 
@@ skipping 38 matching lines @@
    public:
     explicit StarIconView(CommandUpdater* command_updater);
     virtual ~StarIconView() {}
 
     // Shows the bookmark bubble.
     virtual void OnMousePressed(NSRect bounds);
 
     // Set the image and tooltip based on |starred|.
     void SetStarred(bool starred);
 
-    virtual const NSString* GetToolTip();
+    virtual NSString* GetToolTip();
 
    private:
     // For bringing up bookmark bar.
     CommandUpdater* command_updater_;  // Weak, owned by Browser.
 
     // The string to show for a tooltip.
     scoped_nsobject<NSString> tooltip_;
 
     DISALLOW_COPY_AND_ASSIGN(StarIconView);
   };
@@ skipping 33 matching lines @@
     // Called to notify the Page Action that it should determine whether to be
     // visible or hidden. |contents| is the TabContents that is active, |url|
     // is the current page URL.
     void UpdateVisibility(TabContents* contents, const GURL& url);
 
     // Sets the tooltip for this Page Action image.
     void SetToolTip(NSString* tooltip);
     void SetToolTip(std::string tooltip);
 
     // Returns the tooltip for this Page Action image or |nil| if there is none.
-    virtual const NSString* GetToolTip();
+    virtual NSString* GetToolTip();
 
     // Overridden to return a menu.
     virtual NSMenu* GetMenu();
 
    protected:
     // For unit testing only.
     PageActionImageView() : owner_(NULL),
                             profile_(NULL),
                             page_action_(NULL),
                             tracker_(this),
@@ skipping 52 matching lines @@
                             Profile* profile);
     virtual ~ContentSettingImageView();
 
     // Shows a content settings bubble.
     void OnMousePressed(NSRect bounds);
 
     // Updates the image and visibility state based on the supplied TabContents.
     void UpdateFromTabContents(const TabContents* tab_contents);
 
     // Returns the tooltip for this Page Action image or |nil| if there is none.
-    virtual const NSString* GetToolTip();
+    virtual NSString* GetToolTip();
 
    private:
     void SetToolTip(NSString* tooltip);
 
     scoped_ptr<ContentSettingImageModel> content_setting_image_model_;
 
     LocationBarViewMac* owner_;
     Profile* profile_;
     scoped_nsobject<NSString> tooltip_;
 
@@ skipping 40 matching lines @@
   };
 
  private:
   // Sets the location icon we should be showing.
   void SetIcon(int resource_id);
 
   // Sets the label for the SSL state.
   void SetSecurityLabel();
 
   // Posts |notification| to the default notification center.
-  void PostNotification(const NSString* notification);
+  void PostNotification(NSString* notification);
 
   // Updates visibility of the content settings icons based on the current
   // tab contents state.
   void RefreshContentSettingsViews();
 
   scoped_ptr<AutocompleteEditViewMac> edit_view_;
 
   CommandUpdater* command_updater_;  // Weak, owned by Browser.
 
   AutocompleteTextField* field_;  // owned by tab controller
@@ skipping 33 matching lines @@
   // The transition type to use for the navigation.
   PageTransition::Type transition_;
 
   // Used to register for notifications received by NotificationObserver.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_