summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 21:15:44 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 21:15:44 +0000
commitabc2f2619b553610e45f7eaa4ff89582ed185999 (patch)
treecd2aefafaa9d8611c006ce336dd8ad7da46e476d /chrome/browser/ui/cocoa
parentd3108145d5ebe48927b21bb77b6e7454d52d415f (diff)
downloadchromium_src-abc2f2619b553610e45f7eaa4ff89582ed185999.zip
chromium_src-abc2f2619b553610e45f7eaa4ff89582ed185999.tar.gz
chromium_src-abc2f2619b553610e45f7eaa4ff89582ed185999.tar.bz2
fav icon -> favicon. Pass 10: bookmarks
BUG=76073 TEST=none; no visible change Review URL: http://codereview.chromium.org/6693027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa')
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm4
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm4
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm4
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h2
-rw-r--r--chrome/browser/ui/cocoa/tabpose_window.mm4
-rw-r--r--chrome/browser/ui/cocoa/tabs/tab_strip_controller.h2
-rw-r--r--chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm14
14 files changed, 24 insertions, 24 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
index 811c450..849d85cc 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
@@ -41,7 +41,7 @@ class BookmarkBarBridge : public BookmarkModelObserver {
const BookmarkNode* node);
virtual void BookmarkNodeChanged(BookmarkModel* model,
const BookmarkNode* node);
- virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+ virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
const BookmarkNode* node);
virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
const BookmarkNode* node);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
index 54f5e81..a00e7cb 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
@@ -62,9 +62,9 @@ void BookmarkBarBridge::BookmarkNodeChanged(BookmarkModel* model,
[controller_ nodeChanged:model node:node];
}
-void BookmarkBarBridge::BookmarkNodeFavIconLoaded(BookmarkModel* model,
+void BookmarkBarBridge::BookmarkNodeFaviconLoaded(BookmarkModel* model,
const BookmarkNode* node) {
- [controller_ nodeFavIconLoaded:model node:node];
+ [controller_ nodeFaviconLoaded:model node:node];
}
void BookmarkBarBridge::BookmarkNodeChildrenReordered(
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
index 067d327..646af0e 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
@@ -67,7 +67,7 @@ typedef std::pair<GURL,WindowOpenDisposition> OpenInfo;
[callbacks_ addObject:[NSNumber numberWithInt:4]];
}
-- (void)nodeFavIconLoaded:(BookmarkModel*)model
+- (void)nodeFaviconLoaded:(BookmarkModel*)model
node:(const BookmarkNode*)node {
[callbacks_ addObject:[NSNumber numberWithInt:5]];
}
@@ -121,7 +121,7 @@ TEST_F(BookmarkBarBridgeTest, TestRedirect) {
bridge->BookmarkNodeMoved(NULL, NULL, 0, NULL, 0);
bridge->BookmarkNodeAdded(NULL, NULL, 0);
bridge->BookmarkNodeChanged(NULL, NULL);
- bridge->BookmarkNodeFavIconLoaded(NULL, NULL);
+ bridge->BookmarkNodeFaviconLoaded(NULL, NULL);
bridge->BookmarkNodeChildrenReordered(NULL, NULL);
bridge->BookmarkNodeRemoved(NULL, NULL, 0, NULL);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
index 67a9bf4..f17ee23 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
@@ -360,7 +360,7 @@ willAnimateFromState:(bookmarks::VisualState)oldState
newParent:(const BookmarkNode*)newParent newIndex:(int)newIndex;
- (void)nodeRemoved:(BookmarkModel*)model
parent:(const BookmarkNode*)oldParent index:(int)index;
-- (void)nodeFavIconLoaded:(BookmarkModel*)model
+- (void)nodeFaviconLoaded:(BookmarkModel*)model
node:(const BookmarkNode*)node;
- (void)nodeChildrenReordered:(BookmarkModel*)model
node:(const BookmarkNode*)node;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index 0b9202d..19bd58d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -1911,7 +1911,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
// this looks bad I may need to change widthForBookmarkButtonCell to
// add space for an image even if not there on the assumption that
// favicons will eventually load.
-- (void)nodeFavIconLoaded:(BookmarkModel*)model
+- (void)nodeFaviconLoaded:(BookmarkModel*)model
node:(const BookmarkNode*)node {
for (BookmarkButton* button in buttons_.get()) {
const BookmarkNode* cellnode = [button bookmarkNode];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 0033e0b..5d20731 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -927,7 +927,7 @@ TEST_F(BookmarkBarControllerTest, DeleteBookmark) {
EXPECT_EQ(parent->GetChild(1)->GetURL(), GURL(urls[2]));
}
-// TODO(jrg): write a test to confirm that nodeFavIconLoaded calls
+// TODO(jrg): write a test to confirm that nodeFaviconLoaded calls
// checkForBookmarkButtonGrowth:.
TEST_F(BookmarkBarControllerTest, Cell) {
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
index 6d39cf4..52308af 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -126,7 +126,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
[controller_ modelChangedPreserveSelection:YES];
}
- virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+ virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
const BookmarkNode* node) {
// I care nothing for these 'favicons': I only show folders.
}
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
index 37a4a2c..51aadb7 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
@@ -55,7 +55,7 @@ class BookmarkMenuBridge : public BookmarkModelObserver {
const BookmarkNode* node);
virtual void BookmarkNodeChanged(BookmarkModel* model,
const BookmarkNode* node);
- virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+ virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
const BookmarkNode* node);
virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
const BookmarkNode* node);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
index 06b8903..a5bfc5d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -115,7 +115,7 @@ void BookmarkMenuBridge::BookmarkNodeChanged(BookmarkModel* model,
ConfigureMenuItem(node, item, true);
}
-void BookmarkMenuBridge::BookmarkNodeFavIconLoaded(BookmarkModel* model,
+void BookmarkMenuBridge::BookmarkNodeFaviconLoaded(BookmarkModel* model,
const BookmarkNode* node) {
NSMenuItem* item = MenuItemForNode(node);
if (item)
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
index fea87f1..13c92d7 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -355,7 +355,7 @@ TEST_F(BookmarkMenuBridgeTest, TestAddNodeToOther) {
EXPECT_NSEQ(@"http://foo/", [[[other submenu] itemAtIndex:0] title]);
}
-TEST_F(BookmarkMenuBridgeTest, TestFavIconLoading) {
+TEST_F(BookmarkMenuBridgeTest, TestFaviconLoading) {
NSMenu* menu = bridge_->menu_;
BookmarkModel* model = bridge_->GetBookmarkModel();
@@ -369,7 +369,7 @@ TEST_F(BookmarkMenuBridgeTest, TestFavIconLoading) {
NSMenuItem* item = [menu itemWithTitle:@"Test Item"];
EXPECT_TRUE([item image]);
[item setImage:nil];
- bridge_->BookmarkNodeFavIconLoaded(model, node);
+ bridge_->BookmarkNodeFaviconLoaded(model, node);
EXPECT_TRUE([item image]);
}
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h
index 9061132..dcaac34 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h
@@ -66,7 +66,7 @@ class BookmarkModelObserverForCocoa : public BookmarkModelObserver {
const BookmarkNode* parent,
int index) {
}
- virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+ virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
const BookmarkNode* node) {
}
virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index dd98aab..f1c263f 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -1071,10 +1071,10 @@ void AnimateCALayerOpacityFromTo(
// Either we don't have a valid favicon or there was some issue converting
// it from an SkBitmap. Either way, just show the default.
if (!nsFavicon) {
- NSImage* defaultFavIcon =
+ NSImage* defaultFavicon =
ResourceBundle::GetSharedInstance().GetNativeImageNamed(
IDR_DEFAULT_FAVICON);
- nsFavicon = defaultFavIcon;
+ nsFavicon = defaultFavicon;
}
base::mac::ScopedCFTypeRef<CGImageRef> favicon(
base::mac::CopyNSImageToCGImage(nsFavicon));
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h
index 69ffd41..5817cc3 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h
@@ -132,7 +132,7 @@ class ToolbarModel;
scoped_nsobject<NSMutableArray> permanentSubviews_;
// The default favicon, so we can use one copy for all buttons.
- scoped_nsobject<NSImage> defaultFavIcon_;
+ scoped_nsobject<NSImage> defaultFavicon_;
// The amount by which to indent the tabs on the left (to make room for the
// red/yellow/green buttons).
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 5b47e31..2988682 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -127,7 +127,7 @@ private:
- (void)addSubviewToPermanentList:(NSView*)aView;
- (void)regenerateSubviewList;
- (NSInteger)indexForContentsView:(NSView*)view;
-- (void)updateFavIconForContents:(TabContents*)contents
+- (void)updateFaviconForContents:(TabContents*)contents
atIndex:(NSInteger)modelIndex;
- (void)layoutTabsWithAnimation:(BOOL)animate
regenerateSubviews:(BOOL)doUpdate;
@@ -304,7 +304,7 @@ private:
permanentSubviews_.reset([[NSMutableArray alloc] init]);
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- defaultFavIcon_.reset([rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);
+ defaultFavicon_.reset([rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);
[self setIndentForControls:[[self class] defaultIndentForControls]];
@@ -1021,7 +1021,7 @@ private:
// dragging a tab out into a new window, we have to put the tab's favicon
// into the right state up front as we won't be told to do it from anywhere
// else.
- [self updateFavIconForContents:contents->tab_contents() atIndex:modelIndex];
+ [self updateFaviconForContents:contents->tab_contents() atIndex:modelIndex];
// Send a broadcast that the number of tabs have changed.
[[NSNotificationCenter defaultCenter]
@@ -1231,7 +1231,7 @@ private:
// Either we don't have a valid favicon or there was some issue converting it
// from an SkBitmap. Either way, just show the default.
if (!image)
- image = defaultFavIcon_.get();
+ image = defaultFavicon_.get();
NSRect frame = NSMakeRect(0, 0, kIconWidthAndHeight, kIconWidthAndHeight);
NSImageView* view = [[[NSImageView alloc] initWithFrame:frame] autorelease];
[view setImage:image];
@@ -1240,7 +1240,7 @@ private:
// Updates the current loading state, replacing the icon view with a favicon,
// a throbber, the default icon, or nothing at all.
-- (void)updateFavIconForContents:(TabContents*)contents
+- (void)updateFaviconForContents:(TabContents*)contents
atIndex:(NSInteger)modelIndex {
if (!contents)
return;
@@ -1332,7 +1332,7 @@ private:
if (change != TabStripModelObserver::LOADING_ONLY)
[self setTabTitle:tabController withContents:contents->tab_contents()];
- [self updateFavIconForContents:contents->tab_contents() atIndex:modelIndex];
+ [self updateFaviconForContents:contents->tab_contents() atIndex:modelIndex];
TabContentsController* updatedController =
[tabContentsArray_ objectAtIndex:index];
@@ -1383,7 +1383,7 @@ private:
[tabController setMini:tabStripModel_->IsMiniTab(modelIndex)];
[tabController setPinned:tabStripModel_->IsTabPinned(modelIndex)];
[tabController setApp:tabStripModel_->IsAppTab(modelIndex)];
- [self updateFavIconForContents:contents->tab_contents() atIndex:modelIndex];
+ [self updateFaviconForContents:contents->tab_contents() atIndex:modelIndex];
// If the tab is being restored and it's pinned, the mini state is set after
// the tab has already been rendered, so re-layout the tabstrip. In all other
// cases, the state is set before the tab is rendered so this isn't needed.