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

Side by Side Diff: chrome/browser/views/about_chrome_view.cc

Issue 3007008: Cleanup: Break another common->app dependency. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: minor fix Created 10 years, 5 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
« no previous file with comments | « chrome/browser/upgrade_detector.cc ('k') | chrome/browser/views/bug_report_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <algorithm>
8 #include <string>
9 #include <vector>
10
7 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 12 #include "app/resource_bundle.h"
9 #include "base/callback.h" 13 #include "base/callback.h"
10 #include "base/file_version_info.h" 14 #include "base/file_version_info.h"
11 #include "base/i18n/rtl.h" 15 #include "base/i18n/rtl.h"
12 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
13 #include "chrome/app/chrome_version_info.h"
14 #include "chrome/browser/browser_list.h" 17 #include "chrome/browser/browser_list.h"
15 #include "chrome/browser/metrics/user_metrics.h" 18 #include "chrome/browser/metrics/user_metrics.h"
16 #include "chrome/browser/platform_util.h" 19 #include "chrome/browser/platform_util.h"
17 #include "chrome/browser/views/accessible_view_helper.h" 20 #include "chrome/browser/views/accessible_view_helper.h"
18 #include "chrome/common/chrome_constants.h" 21 #include "chrome/common/chrome_constants.h"
22 #include "chrome/common/chrome_version_info.h"
19 #include "chrome/common/url_constants.h" 23 #include "chrome/common/url_constants.h"
20 #include "gfx/canvas.h" 24 #include "gfx/canvas.h"
21 #include "grit/chromium_strings.h" 25 #include "grit/chromium_strings.h"
22 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
23 #include "grit/locale_settings.h" 27 #include "grit/locale_settings.h"
24 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
25 #include "views/controls/textfield/textfield.h" 29 #include "views/controls/textfield/textfield.h"
26 #include "views/controls/throbber.h" 30 #include "views/controls/throbber.h"
27 #include "views/standard_layout.h" 31 #include "views/standard_layout.h"
28 #include "views/view_text_utils.h" 32 #include "views/view_text_utils.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // need to let it know that we will no longer be listening. 132 // need to let it know that we will no longer be listening.
129 if (google_updater_) 133 if (google_updater_)
130 google_updater_->set_status_listener(NULL); 134 google_updater_->set_status_listener(NULL);
131 #endif 135 #endif
132 } 136 }
133 137
134 void AboutChromeView::Init() { 138 void AboutChromeView::Init() {
135 text_direction_is_rtl_ = base::i18n::IsRTL(); 139 text_direction_is_rtl_ = base::i18n::IsRTL();
136 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 140 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
137 141
138 scoped_ptr<FileVersionInfo> version_info( 142 scoped_ptr<FileVersionInfo> version_info(chrome::GetChromeVersionInfo());
139 chrome_app::GetChromeVersionInfo());
140 if (version_info.get() == NULL) { 143 if (version_info.get() == NULL) {
141 NOTREACHED() << L"Failed to initialize about window"; 144 NOTREACHED() << L"Failed to initialize about window";
142 return; 145 return;
143 } 146 }
144 147
145 current_version_ = version_info->file_version(); 148 current_version_ = version_info->file_version();
146 149
147 string16 version_modifier = platform_util::GetVersionStringModifier(); 150 string16 version_modifier = platform_util::GetVersionStringModifier();
148 if (version_modifier.length()) { 151 if (version_modifier.length()) {
149 version_details_ += L" "; 152 version_details_ += L" ";
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 View* parent = GetParent(); 824 View* parent = GetParent();
822 parent->Layout(); 825 parent->Layout();
823 826
824 // Check button may have appeared/disappeared. We cannot call this during 827 // Check button may have appeared/disappeared. We cannot call this during
825 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. 828 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
826 if (window()) 829 if (window())
827 GetDialogClientView()->UpdateDialogButtons(); 830 GetDialogClientView()->UpdateDialogButtons();
828 } 831 }
829 832
830 #endif 833 #endif
OLDNEW
« no previous file with comments | « chrome/browser/upgrade_detector.cc ('k') | chrome/browser/views/bug_report_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698