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

Side by Side Diff: chrome/browser/ui/views/about_chrome_view.h

Issue 8113031: Change std::wstring to string16 for views::Label and views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 2 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 #ifndef CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 111
112 // The dialog dimensions. 112 // The dialog dimensions.
113 gfx::Size dialog_dimensions_; 113 gfx::Size dialog_dimensions_;
114 114
115 // Keeps track of the visible state of the Restart Now button. 115 // Keeps track of the visible state of the Restart Now button.
116 bool restart_button_visible_; 116 bool restart_button_visible_;
117 117
118 // The text to display as the main label of the About box. We draw this text 118 // The text to display as the main label of the About box. We draw this text
119 // word for word with the help of the WordIterator, and make room for URLs 119 // word for word with the help of the WordIterator, and make room for URLs
120 // which are drawn using views::Link. See also |url_offsets_|. 120 // which are drawn using views::Link. See also |url_offsets_|.
121 std::wstring main_label_chunk1_; 121 string16 main_label_chunk1_;
122 std::wstring main_label_chunk2_; 122 string16 main_label_chunk2_;
123 std::wstring main_label_chunk3_; 123 string16 main_label_chunk3_;
124 std::wstring main_label_chunk4_; 124 string16 main_label_chunk4_;
125 std::wstring main_label_chunk5_; 125 string16 main_label_chunk5_;
126 // Determines the order of the two links we draw in the main label. 126 // Determines the order of the two links we draw in the main label.
127 bool chromium_url_appears_first_; 127 bool chromium_url_appears_first_;
128 128
129 #if defined(OS_WIN) && !defined(USE_AURA) 129 #if defined(OS_WIN) && !defined(USE_AURA)
130 // The class that communicates with Google Update to find out if an update is 130 // The class that communicates with Google Update to find out if an update is
131 // available and asks it to start an upgrade. 131 // available and asks it to start an upgrade.
132 scoped_refptr<GoogleUpdate> google_updater_; 132 scoped_refptr<GoogleUpdate> google_updater_;
133 #endif 133 #endif
134 134
135 // The version Google Update reports is available to us. 135 // The version Google Update reports is available to us.
136 std::wstring new_version_available_; 136 std::wstring new_version_available_;
137 137
138 // Whether text direction is left-to-right or right-to-left. 138 // Whether text direction is left-to-right or right-to-left.
139 bool text_direction_is_rtl_; 139 bool text_direction_is_rtl_;
140 140
141 DISALLOW_COPY_AND_ASSIGN(AboutChromeView); 141 DISALLOW_COPY_AND_ASSIGN(AboutChromeView);
142 }; 142 };
143 143
144 #endif // CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_ 144 #endif // CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel_browser_frame_view.cc ('k') | chrome/browser/ui/views/about_chrome_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698