Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6083)

Unified Diff: chrome/browser/cocoa/tab_strip_controller.mm

Issue 449056: Mac: change tab change notifications to pass full TabChangeType. (Closed)
Patch Set: Rebased ToT. Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/cocoa/tab_strip_controller.mm
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 08dd8d717f2b66332edc8421e768f51ff0770424..b6f2573fe99fa9f8421ff57cfb2baf8b918cfb2f 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -1112,11 +1112,17 @@ private:
// throbber state, not anything else about the (partially) loading tab.
- (void)tabChangedWithContents:(TabContents*)contents
atIndex:(NSInteger)modelIndex
- loadingOnly:(BOOL)loading {
+ changeType:(TabStripModelObserver::TabChangeType)change {
// Take closing tabs into account.
NSInteger index = [self indexFromModelIndex:modelIndex];
- if (!loading)
+ if (change == TabStripModelObserver::TITLE_NOT_LOADING) {
+ // TODO(sky): make this work.
+ // We'll receive another notification of the change asynchronously.
+ return;
+ }
+
+ if (change != TabStripModelObserver::LOADING_ONLY)
[self setTabTitle:[tabArray_ objectAtIndex:index] withContents:contents];
[self updateFavIconForContents:contents atIndex:index];
« no previous file with comments | « chrome/browser/cocoa/browser_window_controller.mm ('k') | chrome/browser/cocoa/tab_strip_model_observer_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698