OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/l10n_util.h" | 5 #import "chrome/browser/ui/cocoa/l10n_util.h" |
6 | 6 |
7 #include "base/feature_list.h" | 7 #include "base/feature_list.h" |
| 8 #include "base/i18n/rtl.h" |
8 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
9 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
10 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw
eaker.h" | 11 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw
eaker.h" |
11 | 12 |
12 namespace cocoa_l10n_util { | 13 namespace cocoa_l10n_util { |
13 | 14 |
14 NSInteger CompareFrameY(id view1, id view2, void* context) { | 15 NSInteger CompareFrameY(id view1, id view2, void* context) { |
15 CGFloat y1 = NSMinY([view1 frame]); | 16 CGFloat y1 = NSMinY([view1 frame]); |
16 CGFloat y2 = NSMinY([view2 frame]); | 17 CGFloat y2 = NSMinY([view2 frame]); |
17 if (y1 < y2) | 18 if (y1 < y2) |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 return url; | 80 return url; |
80 else if ([url length] == 0 || [url isEqualToString:title]) | 81 else if ([url length] == 0 || [url isEqualToString:title]) |
81 return title; | 82 return title; |
82 else | 83 else |
83 return [NSString stringWithFormat:@"%@\n%@", title, url]; | 84 return [NSString stringWithFormat:@"%@\n%@", title, url]; |
84 } | 85 } |
85 | 86 |
86 const base::Feature kExperimentalMacRTL{"ExperimentalMacRTL", | 87 const base::Feature kExperimentalMacRTL{"ExperimentalMacRTL", |
87 base::FEATURE_DISABLED_BY_DEFAULT}; | 88 base::FEATURE_DISABLED_BY_DEFAULT}; |
88 | 89 |
89 bool ExperimentalMacRTLIsEnabled() { | 90 bool ShouldDoExperimentalRTLLayout() { |
90 return base::FeatureList::IsEnabled(kExperimentalMacRTL); | 91 return base::i18n::IsRTL() && |
| 92 base::FeatureList::IsEnabled(kExperimentalMacRTL); |
91 } | 93 } |
92 | 94 |
93 } // namespace cocoa_l10n_util | 95 } // namespace cocoa_l10n_util |
OLD | NEW |