Chromium Code Reviews| Index: chrome/browser/ui/views/extensions/extension_dialog.cc |
| diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc |
| index b73427b14f7043608f3f54709b665295f38fda97..15e3ed309e83c203f4869fda01fdbd647be277c3 100644 |
| --- a/chrome/browser/ui/views/extensions/extension_dialog.cc |
| +++ b/chrome/browser/ui/views/extensions/extension_dialog.cc |
| @@ -103,9 +103,9 @@ ExtensionDialog* ExtensionDialog::ShowInternal( |
| // Show a white background while the extension loads. This is prettier than |
| // flashing a black unfilled window frame. |
| - host->view()->set_background( |
| + host->GetExtensionView()->set_background( |
|
tfarina
2012/09/14 13:36:59
Aaron, Ben, any idea how I will get the ExtensionV
Aaron Boodman
2012/09/16 01:07:38
You can static_cast, I assume. You know that it wi
|
| views::Background::CreateSolidBackground(0xFF, 0xFF, 0xFF)); |
| - host->view()->SetVisible(true); |
| + host->GetExtensionView()->SetVisible(true); |
| // Ensure the DOM JavaScript can respond immediately to keyboard shortcuts. |
| host->host_contents()->Focus(); |
| @@ -211,11 +211,12 @@ void ExtensionDialog::MaybeFocusRenderView() { |
| bool ExtensionDialog::CanResize() const { |
| // Can resize only if minimum contents size set. |
| - return extension_host_->view()->GetPreferredSize() != gfx::Size(); |
| + return extension_host_->GetExtensionView()->GetPreferredSize() != gfx::Size(); |
| } |
| void ExtensionDialog::SetMinimumContentsSize(int width, int height) { |
| - extension_host_->view()->SetPreferredSize(gfx::Size(width, height)); |
| + extension_host_->GetExtensionView()->SetPreferredSize( |
| + gfx::Size(width, height)); |
| } |
| ui::ModalType ExtensionDialog::GetModalType() const { |
| @@ -241,15 +242,15 @@ void ExtensionDialog::DeleteDelegate() { |
| } |
| views::Widget* ExtensionDialog::GetWidget() { |
| - return extension_host_->view()->GetWidget(); |
| + return extension_host_->GetExtensionView()->GetWidget(); |
| } |
| const views::Widget* ExtensionDialog::GetWidget() const { |
| - return extension_host_->view()->GetWidget(); |
| + return extension_host_->GetExtensionView()->GetWidget(); |
| } |
| views::View* ExtensionDialog::GetContentsView() { |
| - return extension_host_->view(); |
| + return extension_host_->GetExtensionView(); |
| } |
| ///////////////////////////////////////////////////////////////////////////// |
| @@ -262,7 +263,7 @@ void ExtensionDialog::Observe(int type, |
| case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: |
| // Avoid potential overdraw by removing the temporary background after |
| // the extension finishes loading. |
| - extension_host_->view()->set_background(NULL); |
| + extension_host_->GetExtensionView()->set_background(NULL); |
| // The render view is created during the LoadURL(), so we should |
| // set the focus to the view if nobody else takes the focus. |
| if (content::Details<extensions::ExtensionHost>(host()) == details) |