| OLD | NEW | 
|---|
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #include <Carbon/Carbon.h> | 5 #include <Carbon/Carbon.h> | 
| 6 | 6 | 
| 7 #include "base/mac_util.h" | 7 #include "base/mac_util.h" | 
| 8 #include "base/scoped_nsdisable_screen_updates.h" | 8 #include "base/scoped_nsdisable_screen_updates.h" | 
| 9 #import "base/scoped_nsobject.h" | 9 #import "base/scoped_nsobject.h" | 
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" | 
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 659 } | 659 } | 
| 660 | 660 | 
| 661 - (TabStripController *)tabStripController { | 661 - (TabStripController *)tabStripController { | 
| 662   return tabStripController_; | 662   return tabStripController_; | 
| 663 } | 663 } | 
| 664 | 664 | 
| 665 - (void)setIsLoading:(BOOL)isLoading { | 665 - (void)setIsLoading:(BOOL)isLoading { | 
| 666   [toolbarController_ setIsLoading:isLoading]; | 666   [toolbarController_ setIsLoading:isLoading]; | 
| 667 } | 667 } | 
| 668 | 668 | 
| 669 // Called to start/stop the loading animations. |  | 
| 670 - (void)updateLoadingAnimations:(BOOL)animate { |  | 
| 671   if (animate) { |  | 
| 672     // TODO(pinkerton): determine what throbber animation is necessary and |  | 
| 673     // start a timer to periodically update. Windows tells the tab strip to |  | 
| 674     // do this. It uses a single timer to coalesce the multiple things that |  | 
| 675     // could be updating. http://crbug.com/8281 |  | 
| 676   } else { |  | 
| 677     // TODO(pinkerton): stop the timer. |  | 
| 678   } |  | 
| 679 } |  | 
| 680 |  | 
| 681 // Make the location bar the first responder, if possible. | 669 // Make the location bar the first responder, if possible. | 
| 682 - (void)focusLocationBar { | 670 - (void)focusLocationBar { | 
| 683   [toolbarController_ focusLocationBar]; | 671   [toolbarController_ focusLocationBar]; | 
| 684 } | 672 } | 
| 685 | 673 | 
| 686 - (void)layoutTabs { | 674 - (void)layoutTabs { | 
| 687   [tabStripController_ layoutTabs]; | 675   [tabStripController_ layoutTabs]; | 
| 688 } | 676 } | 
| 689 | 677 | 
| 690 - (TabWindowController*)detachTabToNewWindow:(TabView*)tabView { | 678 - (TabWindowController*)detachTabToNewWindow:(TabView*)tabView { | 
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1311       provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR); | 1299       provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR); | 
| 1312   [theme setValue:toolbarBackgroundColor | 1300   [theme setValue:toolbarBackgroundColor | 
| 1313      forAttribute:@"backgroundColor" | 1301      forAttribute:@"backgroundColor" | 
| 1314             style:GTMThemeStyleToolBar | 1302             style:GTMThemeStyleToolBar | 
| 1315             state:GTMThemeStateActiveWindow]; | 1303             state:GTMThemeStateActiveWindow]; | 
| 1316 | 1304 | 
| 1317   return theme; | 1305   return theme; | 
| 1318 } | 1306 } | 
| 1319 @end | 1307 @end | 
| 1320 | 1308 | 
| OLD | NEW | 
|---|