| 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 void ShowExtensionInstallDialogImpl( | 171 void ShowExtensionInstallDialogImpl( |
| 172 ExtensionInstallPromptShowParams* show_params, | 172 ExtensionInstallPromptShowParams* show_params, |
| 173 ExtensionInstallPrompt::Delegate* delegate, | 173 ExtensionInstallPrompt::Delegate* delegate, |
| 174 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt) { | 174 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt) { |
| 175 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 175 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 176 ExtensionInstallDialogView* dialog = | 176 ExtensionInstallDialogView* dialog = |
| 177 new ExtensionInstallDialogView(show_params->profile(), | 177 new ExtensionInstallDialogView(show_params->profile(), |
| 178 show_params->GetParentWebContents(), | 178 show_params->GetParentWebContents(), |
| 179 delegate, | 179 delegate, |
| 180 prompt); | 180 prompt); |
| 181 CreateBrowserModalDialogViews(dialog, show_params->GetParentWindow())->Show(); | 181 CreateWindowModalDialogViews(dialog, show_params->GetParentWindow())->Show(); |
| 182 } | 182 } |
| 183 | 183 |
| 184 CustomScrollableView::CustomScrollableView() {} | 184 CustomScrollableView::CustomScrollableView() {} |
| 185 CustomScrollableView::~CustomScrollableView() {} | 185 CustomScrollableView::~CustomScrollableView() {} |
| 186 | 186 |
| 187 void CustomScrollableView::Layout() { | 187 void CustomScrollableView::Layout() { |
| 188 SetBounds(x(), y(), width(), GetHeightForWidth(width())); | 188 SetBounds(x(), y(), width(), GetHeightForWidth(width())); |
| 189 views::View::Layout(); | 189 views::View::Layout(); |
| 190 } | 190 } |
| 191 | 191 |
| (...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1170 void ExpandableContainerView::ExpandWithoutAnimation() { | 1170 void ExpandableContainerView::ExpandWithoutAnimation() { |
| 1171 expanded_ = true; | 1171 expanded_ = true; |
| 1172 details_view_->AnimateToState(1.0); | 1172 details_view_->AnimateToState(1.0); |
| 1173 } | 1173 } |
| 1174 | 1174 |
| 1175 // static | 1175 // static |
| 1176 ExtensionInstallPrompt::ShowDialogCallback | 1176 ExtensionInstallPrompt::ShowDialogCallback |
| 1177 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { | 1177 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { |
| 1178 return base::Bind(&ShowExtensionInstallDialogImpl); | 1178 return base::Bind(&ShowExtensionInstallDialogImpl); |
| 1179 } | 1179 } |
| OLD | NEW |