| 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/framed_browser_window.h" | 5 #import "chrome/browser/ui/cocoa/framed_browser_window.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "chrome/browser/global_keyboard_shortcuts_mac.h" | 8 #include "chrome/browser/global_keyboard_shortcuts_mac.h" |
| 9 #include "chrome/browser/profiles/profile_info_util.h" | 9 #include "chrome/browser/profiles/profile_info_util.h" |
| 10 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 10 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 11 #import "chrome/browser/ui/cocoa/custom_frame_view.h" | 11 #import "chrome/browser/ui/cocoa/custom_frame_view.h" |
| 12 #import "chrome/browser/ui/cocoa/nsview_additions.h" | 12 #import "chrome/browser/ui/cocoa/nsview_additions.h" |
| 13 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" | 13 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" |
| 14 #import "chrome/browser/ui/cocoa/themed_window.h" | 14 #import "chrome/browser/ui/cocoa/themed_window.h" |
| 15 #include "chrome/browser/themes/theme_service.h" | 15 #include "chrome/browser/themes/theme_service.h" |
| 16 #include "grit/theme_resources.h" | 16 #include "grit/theme_resources.h" |
| 17 #include "grit/theme_resources_standard.h" | |
| 18 | 17 |
| 19 // Replicate specific 10.7 SDK declarations for building with prior SDKs. | 18 // Replicate specific 10.7 SDK declarations for building with prior SDKs. |
| 20 #if !defined(MAC_OS_X_VERSION_10_7) || \ | 19 #if !defined(MAC_OS_X_VERSION_10_7) || \ |
| 21 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 | 20 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 |
| 22 | 21 |
| 23 @interface NSWindow (LionSDKDeclarations) | 22 @interface NSWindow (LionSDKDeclarations) |
| 24 - (void)toggleFullScreen:(id)sender; | 23 - (void)toggleFullScreen:(id)sender; |
| 25 @end | 24 @end |
| 26 | 25 |
| 27 enum { | 26 enum { |
| (...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 if (titleColor) | 543 if (titleColor) |
| 545 return titleColor; | 544 return titleColor; |
| 546 | 545 |
| 547 if (incognito) | 546 if (incognito) |
| 548 return [NSColor whiteColor]; | 547 return [NSColor whiteColor]; |
| 549 else | 548 else |
| 550 return [NSColor windowFrameTextColor]; | 549 return [NSColor windowFrameTextColor]; |
| 551 } | 550 } |
| 552 | 551 |
| 553 @end | 552 @end |
| OLD | NEW |