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