Fix unit test bustage by making sure ExtensionView::ViewHierarchyChanged calls the base class impl first.

Fix compile bustage by not compiling windows-specific code on other platforms.

TBR=brettw
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/115912

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17172 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 0 deletions

diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index e8f7de6..5f08f78 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -6,7 +6,9 @@
 
 #include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/extensions/extension_host.h"
+#if defined(OS_WIN)
 #include "chrome/browser/extensions/extension_view.h"
+#endif
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/site_instance.h"
@@ -40,12 +42,14 @@ ExtensionProcessManager::~ExtensionProcessManager() {
     delete *iter;
 }
 
+#if defined(OS_WIN)
 ExtensionView* ExtensionProcessManager::CreateView(Extension* extension,
                                                    const GURL& url,
                                                    Browser* browser) {
   return new ExtensionView(
       new ExtensionHost(extension, GetSiteInstanceForURL(url)), browser, url);
 }
+#endif
 
 void ExtensionProcessManager::CreateBackgroundHost(Extension* extension,
                                                    const GURL& url) {
diff --git a/chrome/browser/extensions/extension_process_manager.h b/chrome/browser/extensions/extension_process_manager.h
index ed4a536..b31edb6 100644
--- a/chrome/browser/extensions/extension_process_manager.h
+++ b/chrome/browser/extensions/extension_process_manager.h
@@ -14,7 +14,9 @@ class Browser;
 class BrowsingInstance;
 class Extension;
 class ExtensionHost;
+#if defined(OS_WIN)
 class ExtensionView;
+#endif
 class GURL;
 class Profile;
 class SiteInstance;
@@ -26,11 +28,13 @@ class ExtensionProcessManager : public NotificationObserver {
   ExtensionProcessManager(Profile* profile);
   ~ExtensionProcessManager();
 
+#if defined(OS_WIN)
   // Creates a new ExtensionView, grouping it in the appropriate SiteInstance
   // (and therefore process) based on the URL and profile.
   ExtensionView* CreateView(Extension* extension,
                             const GURL& url,
                             Browser* browser);
+#endif
 
   // Creates a new UI-less extension instance.  Like CreateView, but not
   // displayed anywhere.
diff --git a/chrome/browser/extensions/extension_view.cc b/chrome/browser/extensions/extension_view.cc
index 0db813b..763924d 100644
--- a/chrome/browser/extensions/extension_view.cc
+++ b/chrome/browser/extensions/extension_view.cc
@@ -83,6 +83,7 @@ void ExtensionView::DidContentsPreferredWidthChange(const int pref_width) {
 void ExtensionView::ViewHierarchyChanged(bool is_add,
                                          views::View *parent,
                                          views::View *child) {
+  NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
   if (is_add && GetWidget() && !initialized_) {
     initialized_ = true;