| OLD | NEW |
| 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> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "views/controls/throbber.h" | 31 #include "views/controls/throbber.h" |
| 32 #include "views/standard_layout.h" | 32 #include "views/standard_layout.h" |
| 33 #include "views/view_text_utils.h" | 33 #include "views/view_text_utils.h" |
| 34 #include "views/widget/widget.h" | 34 #include "views/widget/widget.h" |
| 35 #include "views/window/window.h" | 35 #include "views/window/window.h" |
| 36 #include "webkit/glue/webkit_glue.h" | 36 #include "webkit/glue/webkit_glue.h" |
| 37 | 37 |
| 38 #if defined(OS_WIN) | 38 #if defined(OS_WIN) |
| 39 #include <commdlg.h> | 39 #include <commdlg.h> |
| 40 | 40 |
| 41 #include "base/registry.h" | |
| 42 #include "base/win_util.h" | 41 #include "base/win_util.h" |
| 43 #include "chrome/browser/views/restart_message_box.h" | 42 #include "chrome/browser/views/restart_message_box.h" |
| 44 #include "chrome/installer/util/install_util.h" | 43 #include "chrome/installer/util/install_util.h" |
| 45 #endif | 44 #endif |
| 46 | 45 |
| 47 namespace { | 46 namespace { |
| 48 // The pixel width of the version text field. Ideally, we'd like to have the | 47 // The pixel width of the version text field. Ideally, we'd like to have the |
| 49 // bounds set to the edge of the icon. However, the icon is not a view but a | 48 // bounds set to the edge of the icon. However, the icon is not a view but a |
| 50 // part of the background, so we have to hard code the width to make sure | 49 // part of the background, so we have to hard code the width to make sure |
| 51 // the version field doesn't overlap it. | 50 // the version field doesn't overlap it. |
| (...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 View* parent = GetParent(); | 824 View* parent = GetParent(); |
| 826 parent->Layout(); | 825 parent->Layout(); |
| 827 | 826 |
| 828 // Check button may have appeared/disappeared. We cannot call this during | 827 // Check button may have appeared/disappeared. We cannot call this during |
| 829 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. | 828 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. |
| 830 if (window()) | 829 if (window()) |
| 831 GetDialogClientView()->UpdateDialogButtons(); | 830 GetDialogClientView()->UpdateDialogButtons(); |
| 832 } | 831 } |
| 833 | 832 |
| 834 #endif | 833 #endif |
| OLD | NEW |