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 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1318 alpha:1.0]; | 1318 alpha:1.0]; |
1319 [theme setBackgroundColor:incognitoColor]; | 1319 [theme setBackgroundColor:incognitoColor]; |
1320 [theme setValue:[NSColor blackColor] | 1320 [theme setValue:[NSColor blackColor] |
1321 forAttribute:@"textColor" | 1321 forAttribute:@"textColor" |
1322 style:GTMThemeStyleToolBar | 1322 style:GTMThemeStyleToolBar |
1323 state:GTMThemeStateActiveWindow]; | 1323 state:GTMThemeStateActiveWindow]; |
1324 [theme setValue:[NSColor blackColor] | 1324 [theme setValue:[NSColor blackColor] |
1325 forAttribute:@"textColor" | 1325 forAttribute:@"textColor" |
1326 style:GTMThemeStyleTabBarDeselected | 1326 style:GTMThemeStyleTabBarDeselected |
1327 state:GTMThemeStateActiveWindow]; | 1327 state:GTMThemeStateActiveWindow]; |
| 1328 [theme setValue:[NSColor blackColor] |
| 1329 forAttribute:@"textColor" |
| 1330 style:GTMThemeStyleBookmarksBarButton |
| 1331 state:GTMThemeStateActiveWindow]; |
1328 return theme; | 1332 return theme; |
1329 } | 1333 } |
1330 | 1334 |
1331 NSImage* frameImage = provider->GetNSImageNamed(IDR_THEME_FRAME); | 1335 NSImage* frameImage = provider->GetNSImageNamed(IDR_THEME_FRAME); |
1332 NSImage* frameInactiveImage = | 1336 NSImage* frameInactiveImage = |
1333 provider->GetNSImageNamed(IDR_THEME_FRAME_INACTIVE); | 1337 provider->GetNSImageNamed(IDR_THEME_FRAME_INACTIVE); |
1334 | 1338 |
1335 [theme setValue:frameImage | 1339 [theme setValue:frameImage |
1336 forAttribute:@"backgroundImage" | 1340 forAttribute:@"backgroundImage" |
1337 style:GTMThemeStyleWindow | 1341 style:GTMThemeStyleWindow |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1417 provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR); | 1421 provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR); |
1418 [theme setValue:toolbarBackgroundColor | 1422 [theme setValue:toolbarBackgroundColor |
1419 forAttribute:@"backgroundColor" | 1423 forAttribute:@"backgroundColor" |
1420 style:GTMThemeStyleToolBar | 1424 style:GTMThemeStyleToolBar |
1421 state:GTMThemeStateActiveWindow]; | 1425 state:GTMThemeStateActiveWindow]; |
1422 | 1426 |
1423 return theme; | 1427 return theme; |
1424 } | 1428 } |
1425 @end | 1429 @end |
1426 | 1430 |
OLD | NEW |