8 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/cocoa/back_forward_menu_controller.mm b/chrome/browser/cocoa/back_forward_menu_controller.mm
index a362f49..e39927a 100644
--- a/chrome/browser/cocoa/back_forward_menu_controller.mm
+++ b/chrome/browser/cocoa/back_forward_menu_controller.mm
@@ -43,7 +43,7 @@ using gfx::SkBitmapToNSImage;
 // Methods as delegate:
 
 // Called by backForwardMenu_ just before tracking begins.
-//TODO(viettrungluu@gmail.com): do anything for chapter stops (see model)?
+//TODO(viettrungluu): should we do anything for chapter stops (see model)?
 - (void)menuNeedsUpdate:(NSMenu*)menu {
   DCHECK(menu == backForwardMenu_);
 
diff --git a/chrome/browser/cocoa/delayedmenu_button.mm b/chrome/browser/cocoa/delayedmenu_button.mm
index 458bf28..7243285 100644
--- a/chrome/browser/cocoa/delayedmenu_button.mm
+++ b/chrome/browser/cocoa/delayedmenu_button.mm
@@ -102,10 +102,10 @@
     return;
   }
 
-  // FIXME(viettrungluu): We have some fudge factors below to make things line
-  // up (approximately). I wish I knew how to get rid of them. (Note that our
-  // view is flipped, and that frame should be in our coordinates.) The y/height
-  // is very odd, since it doesn't seem to respond to changes the way that it
+  // TODO(viettrungluu): We have some fudge factors below to make things line up
+  // (approximately). I wish I knew how to get rid of them. (Note that our view
+  // is flipped, and that frame should be in our coordinates.) The y/height is
+  // very odd, since it doesn't seem to respond to changes the way that it
   // should. I don't understand it.
   NSRect frame = [self convertRect:[self frame]
                           fromView:[self superview]];
diff --git a/chrome/browser/cocoa/download_item_cell.mm b/chrome/browser/cocoa/download_item_cell.mm
index e910ce4..57d79e3 100644
--- a/chrome/browser/cocoa/download_item_cell.mm
+++ b/chrome/browser/cocoa/download_item_cell.mm
@@ -328,7 +328,7 @@ const int kCompleteAnimationDuration = 2.5;
     theme_.reset([[GTMTheme alloc] init]);
     NSColor* bgColor = [NSColor colorWithCalibratedRed:241/255.0
                                                  green:245/255.0
-                                                  blue:250/255.0 
+                                                  blue:250/255.0
                                                  alpha:77/255.0];
     NSColor* clickedColor = [NSColor colorWithCalibratedRed:239/255.0
                                                       green:245/255.0
@@ -340,7 +340,7 @@ const int kCompleteAnimationDuration = 2.5;
         initWithColors:[NSArray arrayWithObject:bgColor]]);
     scoped_nsobject<NSGradient> clickedGradient([[NSGradient alloc]
         initWithColors:[NSArray arrayWithObject:clickedColor]]);
- 
+
     GTMThemeState states[] = {
         GTMThemeStateActiveWindow, GTMThemeStateInactiveWindow
     };
diff --git a/chrome/browser/cocoa/menu_button.mm b/chrome/browser/cocoa/menu_button.mm
index bfa31ea..bbe55da 100644
--- a/chrome/browser/cocoa/menu_button.mm
+++ b/chrome/browser/cocoa/menu_button.mm
@@ -79,7 +79,7 @@
     return;
   }
 
-  // FIXME(viettrungluu): Silly fudge factors (same as in
+  // TODO(viettrungluu): Remove silly fudge factors (same ones as in
   // delayedmenu_button.mm).
   NSRect frame = [self convertRect:[self frame]
                           fromView:[self superview]];
diff --git a/chrome/browser/cocoa/nsmenuitem_additions_unittest.mm b/chrome/browser/cocoa/nsmenuitem_additions_unittest.mm
index 1279e0c..478b40d 100644
--- a/chrome/browser/cocoa/nsmenuitem_additions_unittest.mm
+++ b/chrome/browser/cocoa/nsmenuitem_additions_unittest.mm
@@ -267,7 +267,7 @@ TEST(NSMenuItemAdditionsTest, TestFiresForKeyEvent) {
 
   // cmd-s with a serbian layout (just "s" produces something that looks a lot
   // like "c" in some fonts, but is actually \u0441. cmd-s activates a menu item
-  // with key equivalent "s", not "c")  
+  // with key equivalent "s", not "c")
   key = KeyEvent(0x100108, @"s", @"\u0441", 1);
   ExpectKeyFiresItem(key, MenuItem(@"s", 0x100000), false);
   ExpectKeyDoesntFireItem(key, MenuItem(@"c", 0x100000));
@@ -295,7 +295,7 @@ NSString* keyCodeToCharacter(NSUInteger keyCode,
       &actualStringLength,
       unicodeString);
   assert(err == noErr);
- 
+
   CFStringRef temp = CFStringCreateWithCharacters(
       kCFAllocatorDefault, unicodeString, 1);
   return [(NSString*)temp autorelease];
diff --git a/chrome/browser/cocoa/nswindow_local_state.h b/chrome/browser/cocoa/nswindow_local_state.h
index 3a3394c..93be19bc 100644
--- a/chrome/browser/cocoa/nswindow_local_state.h
+++ b/chrome/browser/cocoa/nswindow_local_state.h
@@ -12,7 +12,7 @@ class PrefService;
 
 // Saves the window's origin into the given PrefService. Caller is responsible
 // for making sure |prefs| is not NULL.
-- (void)saveWindowPositionToPrefs:(PrefService*)prefs 
+- (void)saveWindowPositionToPrefs:(PrefService*)prefs
                          withPath:(const wchar_t*)path;
 
 - (void)restoreWindowPositionFromPrefs:(PrefService*)prefs
diff --git a/chrome/browser/cocoa/nswindow_local_state.mm b/chrome/browser/cocoa/nswindow_local_state.mm
index 7fdfff6..42bc948 100644
--- a/chrome/browser/cocoa/nswindow_local_state.mm
+++ b/chrome/browser/cocoa/nswindow_local_state.mm
@@ -7,7 +7,7 @@
 
 @implementation NSWindow (LocalStateAdditions)
 
-- (void)saveWindowPositionToPrefs:(PrefService*)prefs 
+- (void)saveWindowPositionToPrefs:(PrefService*)prefs
                          withPath:(const wchar_t*)path {
   DCHECK(prefs);
   // Save the origin of the window.
diff --git a/chrome/browser/cocoa/repost_form_warning_mac.h b/chrome/browser/cocoa/repost_form_warning_mac.h
index 7841fa5..91586cf 100644
--- a/chrome/browser/cocoa/repost_form_warning_mac.h
+++ b/chrome/browser/cocoa/repost_form_warning_mac.h
@@ -44,7 +44,7 @@ class RepostFormWarningMac : public NotificationObserver {
   NavigationController* navigation_controller_;
 
   scoped_nsobject<NSAlert> alert_;
-  
+
   scoped_nsobject<RepostDelegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(RepostFormWarningMac);