diff options
12 files changed, 18 insertions, 18 deletions
diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.mm b/chrome/browser/cocoa/content_blocked_bubble_controller.mm index c27b124..ef16fd5 100644 --- a/chrome/browser/cocoa/content_blocked_bubble_controller.mm +++ b/chrome/browser/cocoa/content_blocked_bubble_controller.mm @@ -324,7 +324,7 @@ static NSString* ReplaceNSStringPlaceholders(NSString* formatString, // showWindow:. Thus, we have our own version. - (void)showWindow:(id)sender { NSWindow* window = [self window]; // completes nib load - + NSPoint origin = [parentWindow_ convertBaseToScreen:anchor_]; origin.x -= NSWidth([window frame]) - kBubbleArrowXOffset - kBubbleArrowWidth / 2; diff --git a/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm b/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm index c2d36b5..055ac01 100644 --- a/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm +++ b/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm @@ -26,7 +26,7 @@ TEST_F(ContentSettingsDialogControllerTest, CreateDialog) { showContentSettingsForType:CONTENT_SETTINGS_TYPE_DEFAULT profile:profile]; EXPECT_TRUE(sharedInstance); - [sharedInstance close]; + [sharedInstance close]; } } // namespace diff --git a/chrome/browser/cocoa/hung_renderer_controller.h b/chrome/browser/cocoa/hung_renderer_controller.h index 1b012ea..b9cad53 100644 --- a/chrome/browser/cocoa/hung_renderer_controller.h +++ b/chrome/browser/cocoa/hung_renderer_controller.h @@ -42,7 +42,7 @@ class TabContents; // Backing data for |tableView_|. Titles of each TabContents that // shares a renderer process with |hungContents_|. scoped_nsobject<NSArray> hungTitles_; - + // Favicons of each TabContents that shares a renderer process with // |hungContents_|. scoped_nsobject<NSArray> hungFavicons_; diff --git a/chrome/browser/cocoa/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar_view_mac.mm index 05fd6ce..854fd45 100644 --- a/chrome/browser/cocoa/location_bar_view_mac.mm +++ b/chrome/browser/cocoa/location_bar_view_mac.mm @@ -873,7 +873,7 @@ void LocationBarViewMac::ContentBlockedImageView::OnMousePressed(NSRect bounds) NULL, NULL); // Transform mouse coordinates to content-view space. - AutocompleteTextField* textField = owner_->GetAutocompleteTextField(); + AutocompleteTextField* textField = owner_->GetAutocompleteTextField(); NSWindow* window = [textField window]; bounds = [[window contentView] convertRect:bounds fromView:textField]; diff --git a/chrome/browser/cocoa/menu_controller.h b/chrome/browser/cocoa/menu_controller.h index 0389bff..9c3282c 100644 --- a/chrome/browser/cocoa/menu_controller.h +++ b/chrome/browser/cocoa/menu_controller.h @@ -1,6 +1,6 @@ -// Copyright (c) 2010 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. +// Copyright (c) 2010 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. #ifndef CHROME_BROWSER_COCOA_MENU_CONTROLLER_H_ #define CHROME_BROWSER_COCOA_MENU_CONTROLLER_H_ diff --git a/chrome/browser/cocoa/menu_controller.mm b/chrome/browser/cocoa/menu_controller.mm index 83a47ed..d095a2e 100644 --- a/chrome/browser/cocoa/menu_controller.mm +++ b/chrome/browser/cocoa/menu_controller.mm @@ -1,6 +1,6 @@ -// Copyright (c) 2010 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. +// Copyright (c) 2010 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. #import "chrome/browser/cocoa/menu_controller.h" diff --git a/chrome/browser/cocoa/menu_controller_unittest.mm b/chrome/browser/cocoa/menu_controller_unittest.mm index 50bbf93..4d75725 100644 --- a/chrome/browser/cocoa/menu_controller_unittest.mm +++ b/chrome/browser/cocoa/menu_controller_unittest.mm @@ -1,6 +1,6 @@ -// Copyright (c) 2009 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. +// Copyright (c) 2009 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. #import <Cocoa/Cocoa.h> diff --git a/chrome/browser/cocoa/rwhvm_editcommand_helper.mm b/chrome/browser/cocoa/rwhvm_editcommand_helper.mm index db74657..3665984 100644 --- a/chrome/browser/cocoa/rwhvm_editcommand_helper.mm +++ b/chrome/browser/cocoa/rwhvm_editcommand_helper.mm @@ -1,4 +1,4 @@ -// Copyright (c), 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. diff --git a/chrome/browser/cocoa/table_row_nsimage_cache.h b/chrome/browser/cocoa/table_row_nsimage_cache.h index 04ca13e..6409123 100644 --- a/chrome/browser/cocoa/table_row_nsimage_cache.h +++ b/chrome/browser/cocoa/table_row_nsimage_cache.h @@ -30,7 +30,7 @@ class TableRowNSImageCache { // Lazily converts the image at the given row and caches it in |icon_images_|. NSImage* GetImageForRow(int row); - + // Call these functions every time the table changes, to update the cache. void OnModelChanged(); void OnItemsChanged(int start, int length); diff --git a/chrome/browser/cocoa/table_row_nsimage_cache.mm b/chrome/browser/cocoa/table_row_nsimage_cache.mm index e8ddab3..11d5bb5 100644 --- a/chrome/browser/cocoa/table_row_nsimage_cache.mm +++ b/chrome/browser/cocoa/table_row_nsimage_cache.mm @@ -7,7 +7,7 @@ #include "base/logging.h" #include "skia/ext/skia_utils_mac.h" -TableRowNSImageCache::TableRowNSImageCache(Table* model) +TableRowNSImageCache::TableRowNSImageCache(Table* model) : model_(model), icon_images_([[NSPointerArray alloc] initWithOptions: NSPointerFunctionsStrongMemory | diff --git a/chrome/browser/cocoa/table_row_nsimage_cache_unittest.mm b/chrome/browser/cocoa/table_row_nsimage_cache_unittest.mm index 975c065..1568b04 100644 --- a/chrome/browser/cocoa/table_row_nsimage_cache_unittest.mm +++ b/chrome/browser/cocoa/table_row_nsimage_cache_unittest.mm @@ -49,7 +49,7 @@ TEST(TableRowNSImageCacheTest, Basics) { // Check that invalidating the second icon only invalidates the second icon cache.OnItemsChanged(/* start =*/1, /* length =*/1); EXPECT_EQ(first_image, cache.GetImageForRow(0)); - + EXPECT_CALL(table, GetIcon(1)).WillOnce(Return(first_bitmap)); NSImage* new_second_image = cache.GetImageForRow(1); EXPECT_EQ(40, [new_second_image size].width); diff --git a/chrome/browser/cocoa/task_manager_mac.mm b/chrome/browser/cocoa/task_manager_mac.mm index f2ce661..2249c47 100644 --- a/chrome/browser/cocoa/task_manager_mac.mm +++ b/chrome/browser/cocoa/task_manager_mac.mm @@ -137,7 +137,7 @@ static const struct ColumnWidth { NSFont* font = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]; [[column.get() dataCell] setFont:font]; - + [column.get() setHidden:!isVisible]; [column.get() setEditable:NO]; |