diff options
| author | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 06:57:01 +0000 |
|---|---|---|
| committer | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 06:57:01 +0000 |
| commit | 730718e87bf37f12c934c62ef5cba922527a2db6 (patch) | |
| tree | 6413633c8f88b79619825d5a157c41ba58f00b00 /ui/aura_shell | |
| parent | 20f1870eda54d1bde430f2e6b33c9cdf3c0ce4a1 (diff) | |
| download | chromium_src-730718e87bf37f12c934c62ef5cba922527a2db6.zip chromium_src-730718e87bf37f12c934c62ef5cba922527a2db6.tar.gz chromium_src-730718e87bf37f12c934c62ef5cba922527a2db6.tar.bz2 | |
Change std::wstring to string16 for views::Label and views::Label
Redo for CR=8113031, it failed on linux_chromeos_clang.
Following files are missed in CR=8113031
1 chrome/browser/chromeos/drop_shadow_label.cc
2 chrome/browser/chromeos/drop_shadow_label.h
3 chrome/browser/ui/views/cookie_info_view.cc
4 chrome/browser/ui/views/database_info_view.cc
5 chrome/browser/ui/views/hung_renderer_view.cccc
6 chrome/browser/ui/views/importer/import_lock_dialog_view.cc
7 chrome/browser/ui/views/task_manager_view.cc
8 ui/aura_shell/examples/bubble.cc
9 views/examples/bubble_example.cc
10 views/examples/link_example.cc
11 views/examples/native_theme_button_example.cc
12 views/examples/text_example.cc
13 views/examples/textfield_example.cc
BUG=68267
TEST=no user visible changes
Review URL: http://codereview.chromium.org/8162013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104445 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/examples/bubble.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/aura_shell/examples/bubble.cc b/ui/aura_shell/examples/bubble.cc index 3e7b929..d0bbbdc 100644 --- a/ui/aura_shell/examples/bubble.cc +++ b/ui/aura_shell/examples/bubble.cc @@ -33,7 +33,7 @@ class ExampleBubbleDelegateView : public views::BubbleDelegateView { virtual gfx::Rect GetBounds() OVERRIDE { return config_.bound; } virtual views::BubbleBorder::ArrowLocation GetFrameArrowLocation() OVERRIDE { return config_.arrow; - } + } private: const BubbleConfig config_; @@ -51,7 +51,7 @@ void CreateBubble(const BubbleConfig& config, params.parent = parent; bubble_widget->Init(params); bubble_widget->client_view()->AsBubbleView()->AddChildView( - new views::Label(L"I am a " + UTF16ToWideHack(config.label))); + new views::Label(ASCIIToUTF16("I am a ") + config.label)); bubble_widget->Show(); } |