Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/reload_button.mm

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/toolbar/reload_button.h" 5 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #import "chrome/browser/ui/cocoa/view_id_util.h" 8 #import "chrome/browser/ui/cocoa/view_id_util.h"
9 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
10 #include "grit/theme_resources.h" 10 #include "grit/theme_resources.h"
11 #include "grit/theme_resources_standard.h"
12 #include "ui/base/l10n/l10n_util.h" 11 #include "ui/base/l10n/l10n_util.h"
13 #include "ui/base/l10n/l10n_util_mac.h" 12 #include "ui/base/l10n/l10n_util_mac.h"
14 13
15 namespace { 14 namespace {
16 15
17 // Constant matches Windows. 16 // Constant matches Windows.
18 NSTimeInterval kPendingReloadTimeout = 1.35; 17 NSTimeInterval kPendingReloadTimeout = 1.35;
19 18
20 } // namespace 19 } // namespace
21 20
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 178
180 @end // ReloadButton 179 @end // ReloadButton
181 180
182 @implementation ReloadButton (Testing) 181 @implementation ReloadButton (Testing)
183 182
184 + (void)setPendingReloadTimeout:(NSTimeInterval)seconds { 183 + (void)setPendingReloadTimeout:(NSTimeInterval)seconds {
185 kPendingReloadTimeout = seconds; 184 kPendingReloadTimeout = seconds;
186 } 185 }
187 186
188 @end 187 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698