diff options
| author | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-13 15:46:41 +0000 |
|---|---|---|
| committer | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-13 15:46:41 +0000 |
| commit | 8830998f7436edb5aabd1a3465d7ba5e7b77fd05 (patch) | |
| tree | 7d90b836f05d2b01b1a68b053aeab068efa73501 /chrome/browser/views | |
| parent | 0d34712130aaa3982dabb0a34e96a2be85a5f2e1 (diff) | |
| download | chromium_src-8830998f7436edb5aabd1a3465d7ba5e7b77fd05.zip chromium_src-8830998f7436edb5aabd1a3465d7ba5e7b77fd05.tar.gz chromium_src-8830998f7436edb5aabd1a3465d7ba5e7b77fd05.tar.bz2 | |
Hook up a bit more plumbing to ExtensionView which should allow popup windows and widgets to work.Add in a quick hack that lets you bring up the web inspector.
Review URL: http://codereview.chromium.org/67029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/views/hwnd_html_view.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 2c41482..62dd928 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -300,9 +300,9 @@ class ExtensionToolstrip : public views::View { public: static const int kPadding = 2; - ExtensionToolstrip(Extension* extension, const GURL& url, Profile* profile) + ExtensionToolstrip(Extension* extension, const GURL& url, Browser* browser) : view_(ExtensionProcessManager::GetInstance()->CreateView( - extension, url, profile)) { + extension, url, browser)) { AddChildView(view_); set_border(views::Border::CreateEmptyBorder( kPadding, kPadding, kPadding, kPadding)); @@ -1378,7 +1378,7 @@ bool BookmarkBarView::AddExtensionToolstrips(const ExtensionList* extensions) { ExtensionToolstrip* view = new ExtensionToolstrip(*extension, (*extension)->GetResourceURL(*toolstrip), - profile_); + browser_); int index = GetBookmarkButtonCount() + num_extension_toolstrips_; AddChildView(index, view); added_toolstrip = true; diff --git a/chrome/browser/views/hwnd_html_view.h b/chrome/browser/views/hwnd_html_view.h index 9a55496..3176551 100644 --- a/chrome/browser/views/hwnd_html_view.h +++ b/chrome/browser/views/hwnd_html_view.h @@ -35,6 +35,8 @@ class HWNDHtmlView : public views::HWNDView { // opportunity to do some setup. virtual void CreatingRenderer() {} + SiteInstance* site_instance() { return site_instance_; } + private: // Initialize the view, parented to |parent|, and show it. void Init(HWND parent); |