OLD | NEW |
---|---|
1 // Copyright (c) 2010 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/toolbar/reload_button.h" | 5 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h" |
6 | 6 |
7 #include "ui/base/l10n/l10n_util.h" | |
8 #include "app/mac/nsimage_cache.h" | |
9 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
10 #import "chrome/browser/ui/cocoa/image_button_cell.h" | 8 #import "chrome/browser/ui/cocoa/image_button_cell.h" |
11 #import "chrome/browser/ui/cocoa/view_id_util.h" | 9 #import "chrome/browser/ui/cocoa/view_id_util.h" |
12 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" |
13 #include "grit/theme_resources.h" | 11 #include "grit/theme_resources.h" |
14 #include "grit/theme_resources_standard.h" | 12 #include "grit/theme_resources_standard.h" |
13 #include "ui/base/l10n/l10n_util.h" | |
15 #include "ui/base/l10n/l10n_util_mac.h" | 14 #include "ui/base/l10n/l10n_util_mac.h" |
15 #include "ui/gfx/mac/nsimage_cache.h" | |
Robert Sesek
2011/06/21 20:13:28
Is this needed?
tfarina
2011/06/21 20:23:36
Removed.
| |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 // Constant matches Windows. | 19 // Constant matches Windows. |
20 NSTimeInterval kPendingReloadTimeout = 1.35; | 20 NSTimeInterval kPendingReloadTimeout = 1.35; |
21 | 21 |
22 } // namespace | 22 } // namespace |
23 | 23 |
24 @implementation ReloadButton | 24 @implementation ReloadButton |
25 | 25 |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
178 | 178 |
179 + (void)setPendingReloadTimeout:(NSTimeInterval)seconds { | 179 + (void)setPendingReloadTimeout:(NSTimeInterval)seconds { |
180 kPendingReloadTimeout = seconds; | 180 kPendingReloadTimeout = seconds; |
181 } | 181 } |
182 | 182 |
183 - (NSTrackingArea*)trackingArea { | 183 - (NSTrackingArea*)trackingArea { |
184 return trackingArea_; | 184 return trackingArea_; |
185 } | 185 } |
186 | 186 |
187 @end | 187 @end |
OLD | NEW |