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

Side by Side Diff: ui/base/gtk/menu_label_accelerator_util.cc

Issue 10316013: linux: Move linux_util.h from gfx/ to ui/base/gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move to ui/base/gtk Created 8 years, 7 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) 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 #include "ui/gfx/linux_util.h" 5 #include "ui/base/gtk/menu_label_accelerator_util.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 8
9 namespace { 9 namespace {
10 10
11 // Common implementation of ConvertAcceleratorsFromWindowsStyle() and 11 // Common implementation of ConvertAcceleratorsFromWindowsStyle() and
12 // RemoveWindowsStyleAccelerators(). 12 // RemoveWindowsStyleAccelerators().
13 // Replaces all ampersands (as used in our grd files to indicate mnemonics) 13 // Replaces all ampersands (as used in our grd files to indicate mnemonics)
14 // to |target|, except ampersands appearing in pairs which are replaced by 14 // to |target|, except ampersands appearing in pairs which are replaced by
15 // a single ampersand. Any underscores get replaced with two underscores as 15 // a single ampersand. Any underscores get replaced with two underscores as
(...skipping 16 matching lines...) Expand all
32 } else { 32 } else {
33 ret.push_back(label[i]); 33 ret.push_back(label[i]);
34 } 34 }
35 } 35 }
36 36
37 return ret; 37 return ret;
38 } 38 }
39 39
40 } // namespace 40 } // namespace
41 41
42 namespace gfx { 42 namespace ui {
43 43
44 std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label) { 44 std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label) {
45 return ConvertAmpersandsTo(label, "_"); 45 return ConvertAmpersandsTo(label, "_");
46 } 46 }
47 47
48 std::string RemoveWindowsStyleAccelerators(const std::string& label) { 48 std::string RemoveWindowsStyleAccelerators(const std::string& label) {
49 return ConvertAmpersandsTo(label, ""); 49 return ConvertAmpersandsTo(label, "");
50 } 50 }
51 51
52 // Replaces all ampersands in |label| with two ampersands. This effectively 52 // Replaces all ampersands in |label| with two ampersands. This effectively
53 // escapes strings for later processing by ConvertAmpersandsTo(), so that 53 // escapes strings for later processing by ConvertAmpersandsTo(), so that
54 // ConvertAmpersandsTo(EscapeWindowsStyleAccelerators(x), *) is |x| with 54 // ConvertAmpersandsTo(EscapeWindowsStyleAccelerators(x), *) is |x| with
55 // underscores doubled, making the string that appears to the user just |x|. 55 // underscores doubled, making the string that appears to the user just |x|.
56 std::string EscapeWindowsStyleAccelerators(const std::string& label) { 56 std::string EscapeWindowsStyleAccelerators(const std::string& label) {
57 std::string ret; 57 std::string ret;
58 ReplaceChars(label, "&", "&&", &ret); 58 ReplaceChars(label, "&", "&&", &ret);
59 return ret; 59 return ret;
60 } 60 }
61 61
62 } // namespace gfx 62 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698