| OLD | NEW |
| 1 // Copyright (c) 2010 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 #include "chrome/browser/views/about_chrome_view.h" | 5 #include "chrome/browser/ui/views/about_chrome_view.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <commdlg.h> | 8 #include <commdlg.h> |
| 9 #endif // defined(OS_WIN) | 9 #endif // defined(OS_WIN) |
| 10 | 10 |
| 11 #include <algorithm> | 11 #include <algorithm> |
| 12 #include <string> | 12 #include <string> |
| 13 #include <vector> | 13 #include <vector> |
| 14 | 14 |
| 15 #include "app/l10n_util.h" | 15 #include "app/l10n_util.h" |
| 16 #include "app/resource_bundle.h" | 16 #include "app/resource_bundle.h" |
| 17 #include "base/callback.h" | 17 #include "base/callback.h" |
| 18 #include "base/i18n/rtl.h" | 18 #include "base/i18n/rtl.h" |
| 19 #include "base/string_number_conversions.h" | 19 #include "base/string_number_conversions.h" |
| 20 #include "base/utf_string_conversions.h" | 20 #include "base/utf_string_conversions.h" |
| 21 #include "base/win/windows_version.h" | 21 #include "base/win/windows_version.h" |
| 22 #include "chrome/browser/browser_list.h" | 22 #include "chrome/browser/browser_list.h" |
| 23 #include "chrome/browser/google/google_util.h" | 23 #include "chrome/browser/google/google_util.h" |
| 24 #include "chrome/browser/metrics/user_metrics.h" | 24 #include "chrome/browser/metrics/user_metrics.h" |
| 25 #include "chrome/browser/platform_util.h" | 25 #include "chrome/browser/platform_util.h" |
| 26 #include "chrome/browser/prefs/pref_service.h" | 26 #include "chrome/browser/prefs/pref_service.h" |
| 27 #include "chrome/browser/views/accessible_view_helper.h" | 27 #include "chrome/browser/ui/views/accessible_view_helper.h" |
| 28 #include "chrome/browser/views/window.h" | 28 #include "chrome/browser/ui/views/window.h" |
| 29 #include "chrome/common/chrome_constants.h" | 29 #include "chrome/common/chrome_constants.h" |
| 30 #include "chrome/common/chrome_version_info.h" | 30 #include "chrome/common/chrome_version_info.h" |
| 31 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
| 32 #include "chrome/common/url_constants.h" | 32 #include "chrome/common/url_constants.h" |
| 33 #include "chrome/installer/util/browser_distribution.h" | 33 #include "chrome/installer/util/browser_distribution.h" |
| 34 #include "gfx/canvas.h" | 34 #include "gfx/canvas.h" |
| 35 #include "grit/chromium_strings.h" | 35 #include "grit/chromium_strings.h" |
| 36 #include "grit/generated_resources.h" | 36 #include "grit/generated_resources.h" |
| 37 #include "grit/locale_settings.h" | 37 #include "grit/locale_settings.h" |
| 38 #include "grit/theme_resources.h" | 38 #include "grit/theme_resources.h" |
| 39 #include "views/controls/textfield/textfield.h" | 39 #include "views/controls/textfield/textfield.h" |
| 40 #include "views/controls/throbber.h" | 40 #include "views/controls/throbber.h" |
| 41 #include "views/standard_layout.h" | 41 #include "views/standard_layout.h" |
| 42 #include "views/view_text_utils.h" | 42 #include "views/view_text_utils.h" |
| 43 #include "views/widget/widget.h" | 43 #include "views/widget/widget.h" |
| 44 #include "views/window/window.h" | 44 #include "views/window/window.h" |
| 45 #include "webkit/glue/webkit_glue.h" | 45 #include "webkit/glue/webkit_glue.h" |
| 46 | 46 |
| 47 #if defined(OS_WIN) | 47 #if defined(OS_WIN) |
| 48 #include "base/win/win_util.h" | 48 #include "base/win/win_util.h" |
| 49 #include "chrome/browser/views/restart_message_box.h" | 49 #include "chrome/browser/ui/views/restart_message_box.h" |
| 50 #include "chrome/installer/util/install_util.h" | 50 #include "chrome/installer/util/install_util.h" |
| 51 #endif // defined(OS_WIN) | 51 #endif // defined(OS_WIN) |
| 52 | 52 |
| 53 #if defined(OS_WIN) || defined(OS_CHROMEOS) | 53 #if defined(OS_WIN) || defined(OS_CHROMEOS) |
| 54 #include "chrome/browser/browser_process.h" | 54 #include "chrome/browser/browser_process.h" |
| 55 #endif // defined(OS_WIN) || defined(OS_CHROMEOS) | 55 #endif // defined(OS_WIN) || defined(OS_CHROMEOS) |
| 56 | 56 |
| 57 namespace { | 57 namespace { |
| 58 // The pixel width of the version text field. Ideally, we'd like to have the | 58 // The pixel width of the version text field. Ideally, we'd like to have the |
| 59 // bounds set to the edge of the icon. However, the icon is not a view but a | 59 // bounds set to the edge of the icon. However, the icon is not a view but a |
| (...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 View* parent = GetParent(); | 825 View* parent = GetParent(); |
| 826 parent->Layout(); | 826 parent->Layout(); |
| 827 | 827 |
| 828 // Check button may have appeared/disappeared. We cannot call this during | 828 // Check button may have appeared/disappeared. We cannot call this during |
| 829 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. | 829 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. |
| 830 if (window()) | 830 if (window()) |
| 831 GetDialogClientView()->UpdateDialogButtons(); | 831 GetDialogClientView()->UpdateDialogButtons(); |
| 832 } | 832 } |
| 833 | 833 |
| 834 #endif | 834 #endif |
| OLD | NEW |