| 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_view.h" | 5 #include "chrome/browser/ui/views/extensions/extension_view.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/extension_host.h" | 7 #include "chrome/browser/extensions/extension_host.h" |
| 8 #include "chrome/browser/ui/views/extensions/extension_popup.h" | 8 #include "chrome/browser/ui/views/extensions/extension_popup.h" |
| 9 #include "chrome/common/chrome_view_type.h" | 9 #include "chrome/common/view_type.h" |
| 10 #include "content/public/browser/content_browser_client.h" | 10 #include "content/public/browser/content_browser_client.h" |
| 11 #include "content/public/browser/render_view_host.h" | 11 #include "content/public/browser/render_view_host.h" |
| 12 #include "content/public/browser/render_widget_host_view.h" | 12 #include "content/public/browser/render_widget_host_view.h" |
| 13 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
| 14 #include "content/public/browser/web_contents_view.h" | 14 #include "content/public/browser/web_contents_view.h" |
| 15 #include "ui/views/widget/widget.h" | 15 #include "ui/views/widget/widget.h" |
| 16 | 16 |
| 17 ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser) | 17 ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser) |
| 18 : host_(host), | 18 : host_(host), |
| 19 browser_(browser), | 19 browser_(browser), |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 container_->OnViewWasResized(); | 157 container_->OnViewWasResized(); |
| 158 } | 158 } |
| 159 } | 159 } |
| 160 | 160 |
| 161 void ExtensionView::RenderViewCreated() { | 161 void ExtensionView::RenderViewCreated() { |
| 162 if (!pending_background_.empty() && render_view_host()->GetView()) { | 162 if (!pending_background_.empty() && render_view_host()->GetView()) { |
| 163 render_view_host()->GetView()->SetBackground(pending_background_); | 163 render_view_host()->GetView()->SetBackground(pending_background_); |
| 164 pending_background_.reset(); | 164 pending_background_.reset(); |
| 165 } | 165 } |
| 166 | 166 |
| 167 content::ViewType host_type = host_->extension_host_type(); | 167 chrome::ViewType host_type = host_->extension_host_type(); |
| 168 if (host_type == chrome::VIEW_TYPE_EXTENSION_POPUP) { | 168 if (host_type == chrome::VIEW_TYPE_EXTENSION_POPUP) { |
| 169 gfx::Size min_size(ExtensionPopup::kMinWidth, | 169 gfx::Size min_size(ExtensionPopup::kMinWidth, |
| 170 ExtensionPopup::kMinHeight); | 170 ExtensionPopup::kMinHeight); |
| 171 gfx::Size max_size(ExtensionPopup::kMaxWidth, | 171 gfx::Size max_size(ExtensionPopup::kMaxWidth, |
| 172 ExtensionPopup::kMaxHeight); | 172 ExtensionPopup::kMaxHeight); |
| 173 render_view_host()->EnableAutoResize(min_size, max_size); | 173 render_view_host()->EnableAutoResize(min_size, max_size); |
| 174 } | 174 } |
| 175 | 175 |
| 176 if (container_) | 176 if (container_) |
| 177 container_->OnViewWasResized(); | 177 container_->OnViewWasResized(); |
| 178 } | 178 } |
| OLD | NEW |