chrome/browser/cocoa/location_bar_view_mac.h - Issue 2769014: Mac/clang: Possibly contentious changes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/cocoa/location_bar_view_mac.h

Issue 2769014: Mac/clang: Possibly contentious changes. (Closed)

Patch Set: comments2 Created 10 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

« no previous file with comments | « chrome/browser/cocoa/keyword_editor_cocoa_controller.h ('k') | chrome/browser/cocoa/location_bar_view_mac.mm » ('j') | chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/cocoa/location_bar_view_mac.h

diff --git a/chrome/browser/cocoa/location_bar_view_mac.h b/chrome/browser/cocoa/location_bar_view_mac.h

index 74c0451fff0a4bd5d9fa80afb0de69de0ed2debf..ef8f0c3676f04740c5d2d7f4d5d5726a3d222511 100644

--- a/chrome/browser/cocoa/location_bar_view_mac.h

+++ b/chrome/browser/cocoa/location_bar_view_mac.h

@@ -163,8 +163,8 @@ class LocationBarViewMac : public AutocompleteEditController,

// 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.

@@ -174,7 +174,7 @@ class LocationBarViewMac : public AutocompleteEditController,

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; }

@@ -233,7 +233,7 @@ class LocationBarViewMac : public AutocompleteEditController,

// 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.

@@ -287,7 +287,7 @@ class LocationBarViewMac : public AutocompleteEditController,

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();

@@ -360,7 +360,7 @@ class LocationBarViewMac : public AutocompleteEditController,

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);

@@ -421,7 +421,7 @@ class LocationBarViewMac : public AutocompleteEditController,

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.