Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2572)

Unified Diff: chrome/browser/ui/views/extensions/extension_dialog.cc

Issue 10913243: extensions: Add ExtensionView interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..3e807dbf31387f574fa5de3d582138bfd335db4d 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->extension_view()->set_background(
views::Background::CreateSolidBackground(0xFF, 0xFF, 0xFF));
- host->view()->SetVisible(true);
+ host->extension_view()->SetVisible(true);
// Ensure the DOM JavaScript can respond immediately to keyboard shortcuts.
host->host_contents()->Focus();
@@ -211,11 +211,11 @@ 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_->extension_view()->GetPreferredSize() != gfx::Size();
}
void ExtensionDialog::SetMinimumContentsSize(int width, int height) {
- extension_host_->view()->SetPreferredSize(gfx::Size(width, height));
+ extension_host_->extension_view()->SetPreferredSize(gfx::Size(width, height));
}
ui::ModalType ExtensionDialog::GetModalType() const {
@@ -241,15 +241,15 @@ void ExtensionDialog::DeleteDelegate() {
}
views::Widget* ExtensionDialog::GetWidget() {
- return extension_host_->view()->GetWidget();
+ return extension_host_->extension_view()->GetWidget();
}
const views::Widget* ExtensionDialog::GetWidget() const {
- return extension_host_->view()->GetWidget();
+ return extension_host_->extension_view()->GetWidget();
}
views::View* ExtensionDialog::GetContentsView() {
- return extension_host_->view();
+ return extension_host_->extension_view();
}
/////////////////////////////////////////////////////////////////////////////
@@ -262,7 +262,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_->extension_view()->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)

Powered by Google App Engine
This is Rietveld 408576698