| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <limits> | 9 #include <limits> | 
| 10 #include <string> | 10 #include <string> | 
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 47 #include "chrome/common/chrome_switches.h" | 47 #include "chrome/common/chrome_switches.h" | 
| 48 #include "chrome/common/pref_names.h" | 48 #include "chrome/common/pref_names.h" | 
| 49 #include "content/browser/tab_contents/navigation_controller.h" | 49 #include "content/browser/tab_contents/navigation_controller.h" | 
| 50 #include "content/browser/tab_contents/navigation_entry.h" | 50 #include "content/browser/tab_contents/navigation_entry.h" | 
| 51 #include "content/browser/tab_contents/tab_contents.h" | 51 #include "content/browser/tab_contents/tab_contents.h" | 
| 52 #include "content/browser/tab_contents/tab_contents_view.h" | 52 #include "content/browser/tab_contents/tab_contents_view.h" | 
| 53 #include "content/common/notification_service.h" | 53 #include "content/common/notification_service.h" | 
| 54 #include "grit/app_resources.h" | 54 #include "grit/app_resources.h" | 
| 55 #include "grit/generated_resources.h" | 55 #include "grit/generated_resources.h" | 
| 56 #include "grit/theme_resources.h" | 56 #include "grit/theme_resources.h" | 
|  | 57 #include "grit/theme_resources_standard.h" | 
| 57 #include "skia/ext/skia_utils_mac.h" | 58 #include "skia/ext/skia_utils_mac.h" | 
| 58 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" | 59 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" | 
| 59 #include "ui/base/l10n/l10n_util.h" | 60 #include "ui/base/l10n/l10n_util.h" | 
| 60 #include "ui/base/resource/resource_bundle.h" | 61 #include "ui/base/resource/resource_bundle.h" | 
| 61 #include "ui/gfx/image.h" | 62 #include "ui/gfx/image.h" | 
| 62 | 63 | 
| 63 NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged"; | 64 NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged"; | 
| 64 | 65 | 
| 65 // 10.7 adds public APIs for full-screen support. Provide the declaration so it | 66 // 10.7 adds public APIs for full-screen support. Provide the declaration so it | 
| 66 // can be called below when building with the 10.5 SDK. | 67 // can be called below when building with the 10.5 SDK. | 
| (...skipping 2036 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2103   } | 2104   } | 
| 2104 | 2105 | 
| 2105   NSString* menuTitle = | 2106   NSString* menuTitle = | 
| 2106       l10n_util::GetNSStringWithFixup(IDS_PROFILES_CREATE_NEW_PROFILE_OPTION); | 2107       l10n_util::GetNSStringWithFixup(IDS_PROFILES_CREATE_NEW_PROFILE_OPTION); | 
| 2107   [menu addItemWithTitle:menuTitle | 2108   [menu addItemWithTitle:menuTitle | 
| 2108                   action:NULL | 2109                   action:NULL | 
| 2109            keyEquivalent:@""]; | 2110            keyEquivalent:@""]; | 
| 2110 } | 2111 } | 
| 2111 | 2112 | 
| 2112 @end | 2113 @end | 
| OLD | NEW | 
|---|