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

Unified Diff: chrome/browser/cocoa/extensions/browser_action_button.mm

Issue 2762014: Mac: clang build (Closed)
Patch Set: more 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
Index: chrome/browser/cocoa/extensions/browser_action_button.mm
diff --git a/chrome/browser/cocoa/extensions/browser_action_button.mm b/chrome/browser/cocoa/extensions/browser_action_button.mm
index a5a2aceb5cfe4350892628c5bd4f9931a37d6af4..fa7ef15a6093349a50e6ebb953e120586cb9c20a 100644
--- a/chrome/browser/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/cocoa/extensions/browser_action_button.mm
@@ -25,12 +25,12 @@
#include "skia/ext/skia_utils_mac.h"
#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
-extern const NSString* kBrowserActionButtonUpdatedNotification =
+NSString* kBrowserActionButtonUpdatedNotification =
@"BrowserActionButtonUpdatedNotification";
-extern const NSString* kBrowserActionButtonDraggingNotification =
+NSString* kBrowserActionButtonDraggingNotification =
@"BrowserActionButtonDraggingNotification";
-extern const NSString* kBrowserActionButtonDragEndNotification =
+NSString* kBrowserActionButtonDragEndNotification =
@"BrowserActionButtonDragEndNotification";
static const CGFloat kBrowserActionBadgeOriginYOffset = 5;
@@ -42,7 +42,7 @@ static const CGFloat kBrowserActionOriginYOffset = 5;
// The size of each button on the toolbar.
static const CGFloat kBrowserActionHeight = 27;
-extern const CGFloat kBrowserActionWidth = 29;
+const CGFloat kBrowserActionWidth = 29;
namespace {
const CGFloat kAnimationDuration = 0.2;
@@ -181,8 +181,6 @@ class ExtensionImageTrackerBridge : public NotificationObserver,
[[self superview] addSubview:self positioned:NSWindowAbove relativeTo:nil];
}
isBeingDragged_ = YES;
- NSPoint location = [self convertPoint:[theEvent locationInWindow]
- fromView:nil];
NSRect buttonFrame = [self frame];
// TODO(andybons): Constrain the buttons to be within the container.
// Clamp the button to be within its superview along the X-axis.

Powered by Google App Engine
This is Rietveld 408576698