| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/browser/views/about_chrome_view.h" | 5 #include "chrome/browser/views/about_chrome_view.h" |
| 6 | 6 |
| 7 #include "app/gfx/canvas.h" | 7 #include "app/gfx/canvas.h" |
| 8 #include "app/gfx/color_utils.h" | 8 #include "app/gfx/color_utils.h" |
| 9 #include "base/i18n/word_iterator.h" | 9 #include "base/i18n/word_iterator.h" |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 130 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 131 | 131 |
| 132 scoped_ptr<FileVersionInfo> version_info( | 132 scoped_ptr<FileVersionInfo> version_info( |
| 133 FileVersionInfo::CreateFileVersionInfoForCurrentModule()); | 133 FileVersionInfo::CreateFileVersionInfoForCurrentModule()); |
| 134 if (version_info.get() == NULL) { | 134 if (version_info.get() == NULL) { |
| 135 NOTREACHED() << L"Failed to initialize about window"; | 135 NOTREACHED() << L"Failed to initialize about window"; |
| 136 return; | 136 return; |
| 137 } | 137 } |
| 138 | 138 |
| 139 current_version_ = version_info->file_version(); | 139 current_version_ = version_info->file_version(); |
| 140 #if !defined(GOOGLE_CHROME_BUILD) |
| 140 current_version_ += L" ("; | 141 current_version_ += L" ("; |
| 141 current_version_ += version_info->last_change(); | 142 current_version_ += version_info->last_change(); |
| 142 current_version_ += L")"; | 143 current_version_ += L")"; |
| 144 #endif |
| 143 | 145 |
| 144 string16 version_modifier = platform_util::GetVersionStringModifier(); | 146 string16 version_modifier = platform_util::GetVersionStringModifier(); |
| 145 if (version_modifier.length()) { | 147 if (version_modifier.length()) { |
| 146 current_version_ += L" "; | 148 current_version_ += L" "; |
| 147 current_version_ += UTF16ToWide(version_modifier); | 149 current_version_ += UTF16ToWide(version_modifier); |
| 148 } | 150 } |
| 149 | 151 |
| 150 // Views we will add to the *parent* of this dialog, since it will display | 152 // Views we will add to the *parent* of this dialog, since it will display |
| 151 // next to the buttons which we don't draw ourselves. | 153 // next to the buttons which we don't draw ourselves. |
| 152 throbber_.reset(new views::Throbber(50, true)); | 154 throbber_.reset(new views::Throbber(50, true)); |
| (...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 908 View* parent = GetParent(); | 910 View* parent = GetParent(); |
| 909 parent->Layout(); | 911 parent->Layout(); |
| 910 | 912 |
| 911 // Check button may have appeared/disappeared. We cannot call this during | 913 // Check button may have appeared/disappeared. We cannot call this during |
| 912 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. | 914 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. |
| 913 if (window()) | 915 if (window()) |
| 914 GetDialogClientView()->UpdateDialogButtons(); | 916 GetDialogClientView()->UpdateDialogButtons(); |
| 915 } | 917 } |
| 916 | 918 |
| 917 #endif | 919 #endif |
| OLD | NEW |