summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 22:10:35 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 22:10:35 +0000
commit53a43fe9573e0d9fea35978cd6583ec9cefa33f0 (patch)
tree27904557028ab11416fc570e5d53754d07e828ee /chrome/browser/cocoa
parentaf4d76441db0a6c35b4dc32a0d7fc4cca6e31453 (diff)
downloadchromium_src-53a43fe9573e0d9fea35978cd6583ec9cefa33f0.zip
chromium_src-53a43fe9573e0d9fea35978cd6583ec9cefa33f0.tar.gz
chromium_src-53a43fe9573e0d9fea35978cd6583ec9cefa33f0.tar.bz2
[Mac] Fix build break with r52223.
image and pboard were always initialized, but warning that they couldn't only happened on opt build, which I didn't, mea culpa... BUG=none TEST=none Review URL: http://codereview.chromium.org/2951012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.mm b/chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.mm
index ba58bd4..269a897 100644
--- a/chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.mm
+++ b/chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.mm
@@ -649,7 +649,7 @@ void CalculatePositionsInFrame(
inMode:NSEventTrackingRunLoopMode
dequeue:YES];
if (!event || [event type] == NSLeftMouseDragged) {
- NSPasteboard* pboard;
+ NSPasteboard* pboard = nil;
if (icon) pboard = [icon view]->GetDragPasteboard();
if (decoration) pboard = decoration->GetDragPasteboard();
DCHECK(pboard);
@@ -663,7 +663,7 @@ void CalculatePositionsInFrame(
if ([controlView isFlipped])
dragPoint.y += NSHeight(decorationRect);
- NSImage* image;
+ NSImage* image = nil;
if (icon) image = [icon view]->GetImage();
if (decoration) image = decoration->GetDragImage();
[controlView dragImage:image