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

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: Unify the version string to be displayed on "About Chromium" dialog 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 void UpdateStatus(GoogleUpdateUpgradeResult result, 88 void UpdateStatus(GoogleUpdateUpgradeResult result,
89 GoogleUpdateErrorCode error_code); 89 GoogleUpdateErrorCode error_code);
90 #endif 90 #endif
91 91
92 Profile* profile_; 92 Profile* profile_;
93 93
94 // UI elements on the dialog. 94 // UI elements on the dialog.
95 views::ImageView* about_dlg_background_logo_; 95 views::ImageView* about_dlg_background_logo_;
96 views::Label* about_title_label_; 96 views::Label* about_title_label_;
97 views::Textfield* version_label_; 97 views::Textfield* version_label_;
98 views::Textfield* os_version_label_;
tony 2011/06/14 18:56:31 I suspect this is here for a reason and we shouldn
haraken1 2011/06/15 04:20:41 I think it is OK to remove |os_version_label_| sin
99 views::Label* copyright_label_; 98 views::Label* copyright_label_;
100 views::Label* main_text_label_; 99 views::Label* main_text_label_;
101 int main_text_label_height_; 100 int main_text_label_height_;
102 views::Link* chromium_url_; 101 views::Link* chromium_url_;
103 gfx::Rect chromium_url_rect_; 102 gfx::Rect chromium_url_rect_;
104 views::Link* open_source_url_; 103 views::Link* open_source_url_;
105 gfx::Rect open_source_url_rect_; 104 gfx::Rect open_source_url_rect_;
106 views::Link* terms_of_service_url_; 105 views::Link* terms_of_service_url_;
107 gfx::Rect terms_of_service_url_rect_; 106 gfx::Rect terms_of_service_url_rect_;
108 // UI elements we add to the parent view. 107 // UI elements we add to the parent view.
(...skipping 19 matching lines...) Expand all
128 std::wstring main_label_chunk5_; 127 std::wstring main_label_chunk5_;
129 // Determines the order of the two links we draw in the main label. 128 // Determines the order of the two links we draw in the main label.
130 bool chromium_url_appears_first_; 129 bool chromium_url_appears_first_;
131 130
132 #if defined(OS_WIN) 131 #if defined(OS_WIN)
133 // The class that communicates with Google Update to find out if an update is 132 // The class that communicates with Google Update to find out if an update is
134 // available and asks it to start an upgrade. 133 // available and asks it to start an upgrade.
135 scoped_refptr<GoogleUpdate> google_updater_; 134 scoped_refptr<GoogleUpdate> google_updater_;
136 #endif 135 #endif
137 136
138 // Our current version.
139 std::string current_version_;
140
141 // Additional information about the version (channel and build number).
142 std::string version_details_;
143
144 // The version Google Update reports is available to us. 137 // The version Google Update reports is available to us.
145 std::wstring new_version_available_; 138 std::wstring new_version_available_;
146 139
147 // Whether text direction is left-to-right or right-to-left. 140 // Whether text direction is left-to-right or right-to-left.
148 bool text_direction_is_rtl_; 141 bool text_direction_is_rtl_;
149 142
150 DISALLOW_COPY_AND_ASSIGN(AboutChromeView); 143 DISALLOW_COPY_AND_ASSIGN(AboutChromeView);
151 }; 144 };
152 145
153 #endif // CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_ 146 #endif // CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698