| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/views/extensions/extension_install_dialog_view.h" | 5 #include "chrome/browser/ui/views/extensions/extension_install_dialog_view.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 } | 747 } |
| 748 return layout; | 748 return layout; |
| 749 } | 749 } |
| 750 | 750 |
| 751 void ExtensionInstallDialogView::ContentsChanged() { | 751 void ExtensionInstallDialogView::ContentsChanged() { |
| 752 Layout(); | 752 Layout(); |
| 753 } | 753 } |
| 754 | 754 |
| 755 void ExtensionInstallDialogView::ViewHierarchyChanged( | 755 void ExtensionInstallDialogView::ViewHierarchyChanged( |
| 756 const ViewHierarchyChangedDetails& details) { | 756 const ViewHierarchyChangedDetails& details) { |
| 757 views::DialogDelegateView::ViewHierarchyChanged(details); |
| 757 // Since we want the links to show up in the same visual row as the accept | 758 // Since we want the links to show up in the same visual row as the accept |
| 758 // and cancel buttons, which is provided by the framework, we must add the | 759 // and cancel buttons, which is provided by the framework, we must add the |
| 759 // buttons to the non-client view, which is the parent of this view. | 760 // buttons to the non-client view, which is the parent of this view. |
| 760 // Similarly, when we're removed from the view hierarchy, we must take care | 761 // Similarly, when we're removed from the view hierarchy, we must take care |
| 761 // to clean up those items as well. | 762 // to clean up those items as well. |
| 762 if (details.child == this) { | 763 if (details.child == this) { |
| 763 if (details.is_add) { | 764 if (details.is_add) { |
| 764 if (show_details_link_) | 765 if (show_details_link_) |
| 765 details.parent->AddChildView(show_details_link_); | 766 details.parent->AddChildView(show_details_link_); |
| 766 if (checkbox_info_label_) | 767 if (checkbox_info_label_) |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1169 void ExpandableContainerView::ExpandWithoutAnimation() { | 1170 void ExpandableContainerView::ExpandWithoutAnimation() { |
| 1170 expanded_ = true; | 1171 expanded_ = true; |
| 1171 details_view_->AnimateToState(1.0); | 1172 details_view_->AnimateToState(1.0); |
| 1172 } | 1173 } |
| 1173 | 1174 |
| 1174 // static | 1175 // static |
| 1175 ExtensionInstallPrompt::ShowDialogCallback | 1176 ExtensionInstallPrompt::ShowDialogCallback |
| 1176 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { | 1177 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { |
| 1177 return base::Bind(&ShowExtensionInstallDialogImpl); | 1178 return base::Bind(&ShowExtensionInstallDialogImpl); |
| 1178 } | 1179 } |
| OLD | NEW |