| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" | 5 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" |
| 6 | 6 |
| 7 #import <QuartzCore/QuartzCore.h> | 7 #import <QuartzCore/QuartzCore.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 #include <limits> | 10 #include <limits> |
| (...skipping 1266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1277 if (!inForeground) { | 1277 if (!inForeground) { |
| 1278 [self layoutTabs]; | 1278 [self layoutTabs]; |
| 1279 } | 1279 } |
| 1280 | 1280 |
| 1281 // During normal loading, we won't yet have a favicon and we'll get | 1281 // During normal loading, we won't yet have a favicon and we'll get |
| 1282 // subsequent state change notifications to show the throbber, but when we're | 1282 // subsequent state change notifications to show the throbber, but when we're |
| 1283 // dragging a tab out into a new window, we have to put the tab's favicon | 1283 // dragging a tab out into a new window, we have to put the tab's favicon |
| 1284 // into the right state up front as we won't be told to do it from anywhere | 1284 // into the right state up front as we won't be told to do it from anywhere |
| 1285 // else. | 1285 // else. |
| 1286 [self updateIconsForContents:contents atIndex:modelIndex]; | 1286 [self updateIconsForContents:contents atIndex:modelIndex]; |
| 1287 |
| 1288 [delegate_ onTabInsertedInForeground:inForeground]; |
| 1287 } | 1289 } |
| 1288 | 1290 |
| 1289 // Called before |contents| is deactivated. | 1291 // Called before |contents| is deactivated. |
| 1290 - (void)tabDeactivatedWithContents:(content::WebContents*)contents { | 1292 - (void)tabDeactivatedWithContents:(content::WebContents*)contents { |
| 1291 contents->StoreFocus(); | 1293 contents->StoreFocus(); |
| 1292 } | 1294 } |
| 1293 | 1295 |
| 1294 // Called when a notification is received from the model to select a particular | 1296 // Called when a notification is received from the model to select a particular |
| 1295 // tab. Swaps in the toolbar and content area associated with |newContents|. | 1297 // tab. Swaps in the toolbar and content area associated with |newContents|. |
| 1296 - (void)activateTabWithContents:(content::WebContents*)newContents | 1298 - (void)activateTabWithContents:(content::WebContents*)newContents |
| (...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2309 | 2311 |
| 2310 - (void)themeDidChangeNotification:(NSNotification*)notification { | 2312 - (void)themeDidChangeNotification:(NSNotification*)notification { |
| 2311 [newTabButton_ setImages]; | 2313 [newTabButton_ setImages]; |
| 2312 } | 2314 } |
| 2313 | 2315 |
| 2314 - (void)setVisualEffectsDisabledForFullscreen:(BOOL)fullscreen { | 2316 - (void)setVisualEffectsDisabledForFullscreen:(BOOL)fullscreen { |
| 2315 [tabStripView_ setVisualEffectsDisabledForFullscreen:fullscreen]; | 2317 [tabStripView_ setVisualEffectsDisabledForFullscreen:fullscreen]; |
| 2316 } | 2318 } |
| 2317 | 2319 |
| 2318 @end | 2320 @end |
| OLD | NEW |