summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 20:57:34 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 20:57:34 +0000
commit439715b7b5702c61e7609bc2b1fd3e8a0e1ccac9 (patch)
tree8c6796e50204ad275e376703eaa0d36cfd0291f3 /chrome
parent4958f9fb8d57661a370ac4291a27b740daadbdd7 (diff)
downloadchromium_src-439715b7b5702c61e7609bc2b1fd3e8a0e1ccac9.zip
chromium_src-439715b7b5702c61e7609bc2b1fd3e8a0e1ccac9.tar.gz
chromium_src-439715b7b5702c61e7609bc2b1fd3e8a0e1ccac9.tar.bz2
Delete some unused code found by the clang static analyzer.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8313008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ui/cocoa/background_tile_view.h3
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h5
-rw-r--r--chrome/browser/ui/cocoa/browser_window_controller.h6
-rw-r--r--chrome/browser/ui/cocoa/browser_window_controller_private.mm7
-rw-r--r--chrome/browser/ui/cocoa/menu_button.h1
-rw-r--r--chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm8
-rw-r--r--chrome/browser/ui/cocoa/tabs/tab_view.h3
7 files changed, 5 insertions, 28 deletions
diff --git a/chrome/browser/ui/cocoa/background_tile_view.h b/chrome/browser/ui/cocoa/background_tile_view.h
index 9a08113..9a21336 100644
--- a/chrome/browser/ui/cocoa/background_tile_view.h
+++ b/chrome/browser/ui/cocoa/background_tile_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -13,7 +13,6 @@
@interface BackgroundTileView : NSView {
@private
- BOOL showsDivider_;
NSImage* tileImage_;
}
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h
index f768e27..9b37fc2 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h
@@ -14,10 +14,7 @@ class BookmarkNode;
// bookmark bar. This cell forwards mouseEntered/mouseExited events
// to its control view so that pseudo-menu operations
// (e.g. hover-over to open) can be implemented.
-@interface BookmarkBarFolderButtonCell : BookmarkButtonCell {
- @private
- scoped_nsobject<NSColor> frameColor_;
-}
+@interface BookmarkBarFolderButtonCell : BookmarkButtonCell
// Create a button cell which draws without a theme and with a frame
// color provided by the ThemeService defaults.
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h
index 54713e8..bba8f02 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.h
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h
@@ -99,12 +99,6 @@ class TabContents;
// NO on growth.
BOOL isShrinkingFromZoomed_;
- // Touch event data for two-finger gestures. Only available on Lion or higher
- // with two-finger gestures enabled in the Trackpad preferences. This will
- // contain the NSTouch objects from |-beginGestureWithEvent:| keyed by the
- // touch's |identity|.
- scoped_nsobject<NSMutableDictionary> twoFingerGestureTouches_;
-
// The raw accumulated zoom value and the actual zoom increments made for an
// an in-progress pinch gesture.
CGFloat totalMagnifyGestureAmount_;
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index dafa537..e0278cd 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -215,7 +215,6 @@ willPositionSheet:(NSWindow*)sheet
(std::floor((1 - floatingBarShownFraction_) * floatingBarHeight) -
[presentationModeController_ floatingBarVerticalOffset]) : 0;
CGFloat maxY = NSMaxY(contentBounds) + yOffset;
- CGFloat startMaxY = maxY;
CGFloat overlayMaxY =
NSMaxY([window frame]) +
@@ -224,10 +223,8 @@ willPositionSheet:(NSWindow*)sheet
overlayMaxY:overlayMaxY];
if ([self hasTabStrip]) {
- // If we need to lay out the top tab strip, replace |maxY| and |startMaxY|
- // with higher values, and then lay out the tab strip.
- NSRect windowFrame = [contentView convertRect:[window frame] fromView:nil];
- startMaxY = maxY = NSHeight(windowFrame) + yOffset;
+ // If we need to lay out the top tab strip, replace |maxY| with a higher
+ // value, and then lay out the tab strip.
maxY = [self layoutTabStripAtMaxY:maxY
width:width
fullscreen:[self isFullscreen]];
diff --git a/chrome/browser/ui/cocoa/menu_button.h b/chrome/browser/ui/cocoa/menu_button.h
index bc12be8..5af3e36 100644
--- a/chrome/browser/ui/cocoa/menu_button.h
+++ b/chrome/browser/ui/cocoa/menu_button.h
@@ -26,7 +26,6 @@
@interface MenuButton : ToolbarButton {
@private
scoped_nsobject<NSMenu> attachedMenu_;
- BOOL attachedMenuEnabled_;
BOOL openMenuOnClick_;
BOOL openMenuOnRightClick_;
scoped_nsobject<NSPopUpButtonCell> popUpCell_;
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm
index a2e0f78..fd13ad5 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm
@@ -214,8 +214,6 @@ const NSTimeInterval kTearDuration = 0.333;
// Do not start dragging until the user has "torn" the tab off by
// moving more than 3 pixels.
- NSDate* targetDwellDate = nil; // The date this target was first chosen.
-
NSPoint thisPoint = [NSEvent mouseLocation];
// Iterate over possible targets checking for the one the mouse is in.
@@ -242,7 +240,6 @@ const NSTimeInterval kTearDuration = 0.333;
// If we're now targeting a new window, re-layout the tabs in the old
// target and reset how long we've been hovering over this new one.
if (targetController_ != newTarget) {
- targetDwellDate = [NSDate date];
[targetController_ removePlaceholder];
targetController_ = newTarget;
if (!newTarget) {
@@ -354,11 +351,8 @@ const NSTimeInterval kTearDuration = 0.333;
// opaque. Otherwise, find where the tab might be dropped and insert
// a placeholder so it appears like it's part of that window.
if (targetController_) {
- if (![[targetController_ window] isKeyWindow]) {
- // && ([targetDwellDate timeIntervalSinceNow] < -REQUIRED_DWELL)) {
+ if (![[targetController_ window] isKeyWindow])
[[targetController_ window] orderFront:nil];
- targetDwellDate = nil;
- }
// Compute where placeholder should go and insert it into the
// destination tab strip.
diff --git a/chrome/browser/ui/cocoa/tabs/tab_view.h b/chrome/browser/ui/cocoa/tabs/tab_view.h
index 72d434a..e53d244 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_view.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_view.h
@@ -48,9 +48,6 @@ enum AlertState {
BOOL closing_;
- // Tracking area for close button mouseover images.
- scoped_nsobject<NSTrackingArea> closeTrackingArea_;
-
BOOL isMouseInside_; // Is the mouse hovering over?
tabs::AlertState alertState_;