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

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

Issue 7104106: Unify the version string to be displayed on "About Chromium" dialog. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Change [\s\S]* to .* with re.DOTALL option Created 9 years, 6 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 "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 void UpdateStatus(GoogleUpdateUpgradeResult result, 86 void UpdateStatus(GoogleUpdateUpgradeResult result,
87 GoogleUpdateErrorCode error_code); 87 GoogleUpdateErrorCode error_code);
88 #endif 88 #endif
89 89
90 Profile* profile_; 90 Profile* profile_;
91 91
92 // UI elements on the dialog. 92 // UI elements on the dialog.
93 views::ImageView* about_dlg_background_logo_; 93 views::ImageView* about_dlg_background_logo_;
94 views::Label* about_title_label_; 94 views::Label* about_title_label_;
95 views::Textfield* version_label_; 95 views::Textfield* version_label_;
96 views::Textfield* os_version_label_;
97 views::Label* copyright_label_; 96 views::Label* copyright_label_;
98 views::Label* main_text_label_; 97 views::Label* main_text_label_;
99 int main_text_label_height_; 98 int main_text_label_height_;
100 views::Link* chromium_url_; 99 views::Link* chromium_url_;
101 gfx::Rect chromium_url_rect_; 100 gfx::Rect chromium_url_rect_;
102 views::Link* open_source_url_; 101 views::Link* open_source_url_;
103 gfx::Rect open_source_url_rect_; 102 gfx::Rect open_source_url_rect_;
104 views::Link* terms_of_service_url_; 103 views::Link* terms_of_service_url_;
105 gfx::Rect terms_of_service_url_rect_; 104 gfx::Rect terms_of_service_url_rect_;
106 // UI elements we add to the parent view. 105 // UI elements we add to the parent view.
(...skipping 19 matching lines...) Expand all
126 std::wstring main_label_chunk5_; 125 std::wstring main_label_chunk5_;
127 // 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.
128 bool chromium_url_appears_first_; 127 bool chromium_url_appears_first_;
129 128
130 #if defined(OS_WIN) 129 #if defined(OS_WIN)
131 // 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
132 // available and asks it to start an upgrade. 131 // available and asks it to start an upgrade.
133 scoped_refptr<GoogleUpdate> google_updater_; 132 scoped_refptr<GoogleUpdate> google_updater_;
134 #endif 133 #endif
135 134
136 // Our current version.
137 std::string current_version_;
138
139 // Additional information about the version (channel and build number).
140 std::string version_details_;
141
142 // The version Google Update reports is available to us. 135 // The version Google Update reports is available to us.
143 std::wstring new_version_available_; 136 std::wstring new_version_available_;
144 137
145 // Whether text direction is left-to-right or right-to-left. 138 // Whether text direction is left-to-right or right-to-left.
146 bool text_direction_is_rtl_; 139 bool text_direction_is_rtl_;
147 140
148 DISALLOW_COPY_AND_ASSIGN(AboutChromeView); 141 DISALLOW_COPY_AND_ASSIGN(AboutChromeView);
149 }; 142 };
150 143
151 #endif // CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_ 144 #endif // CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698