4 files changed, 0 insertions, 67 deletions
diff --git a/chrome/browser/extensions/extension_view_host_factory.cc b/chrome/browser/extensions/extension_view_host_factory.cc
index 956ceb5..d98b2b7 100644
--- a/chrome/browser/extensions/extension_view_host_factory.cc
+++ b/chrome/browser/extensions/extension_view_host_factory.cc
@@ -14,10 +14,6 @@
 #include "extensions/common/manifest_handlers/incognito_info.h"
 #include "extensions/common/view_type.h"
 
-#if defined(OS_MACOSX)
-#include "chrome/browser/extensions/extension_view_host_mac.h"
-#endif
-
 namespace extensions {
 
 namespace {
@@ -36,11 +32,7 @@ ExtensionViewHost* CreateViewHostForExtension(const Extension* extension,
   scoped_refptr<content::SiteInstance> site_instance =
       ProcessManager::Get(profile)->GetSiteInstanceForURL(url);
   ExtensionViewHost* host =
-#if defined(OS_MACOSX)
-      new ExtensionViewHostMac(extension, site_instance.get(), url, view_type);
-#else
       new ExtensionViewHost(extension, site_instance.get(), url, view_type);
-#endif
   host->CreateView(browser);
   return host;
 }
diff --git a/chrome/browser/extensions/extension_view_host_mac.h b/chrome/browser/extensions/extension_view_host_mac.h
deleted file mode 100644
index 938ae97..0000000
--- a/chrome/browser/extensions/extension_view_host_mac.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_HOST_MAC_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_HOST_MAC_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "chrome/browser/extensions/extension_view_host.h"
-
-namespace extensions {
-class Extension;
-
-// TODO(mpcomplete): I don't know what this does or if it is needed anymore,
-// now that ExtensionHost is restructured to rely on WebContents.
-class ExtensionViewHostMac : public ExtensionViewHost {
- public:
-  ExtensionViewHostMac(const Extension* extension,
-                       content::SiteInstance* site_instance,
-                       const GURL& url,
-                       ViewType host_type)
-      : ExtensionViewHost(extension, site_instance, url, host_type) {}
-  ~ExtensionViewHostMac() override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ExtensionViewHostMac);
-};
-
-}  // namespace extensions
-
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_HOST_MAC_H_
diff --git a/chrome/browser/extensions/extension_view_host_mac.mm b/chrome/browser/extensions/extension_view_host_mac.mm
deleted file mode 100644
index 5db8071..0000000
--- a/chrome/browser/extensions/extension_view_host_mac.mm
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/extensions/extension_view_host_mac.h"
-
-#import "base/mac/foundation_util.h"
-#import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
-#import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
-#import "chrome/browser/ui/cocoa/info_bubble_window.h"
-
-namespace extensions {
-
-ExtensionViewHostMac::~ExtensionViewHostMac() {
-  // If there is a popup open for this host's extension, close it.
-  ExtensionPopupController* popup = [ExtensionPopupController popup];
-  InfoBubbleWindow* window =
-      base::mac::ObjCCast<InfoBubbleWindow>([popup window]);
-  if ([window isVisible] && [popup extensionViewHost] == this) {
-    [window setAllowedAnimations:info_bubble::kAnimateNone];
-    [popup close];
-  }
-}
-
-}  // namespace extensions
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 0e66f77..348ce04a 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -644,8 +644,6 @@
       'browser/extensions/extension_view_host.h',
       'browser/extensions/extension_view_host_factory.cc',
       'browser/extensions/extension_view_host_factory.h',
-      'browser/extensions/extension_view_host_mac.h',
-      'browser/extensions/extension_view_host_mac.mm',
       'browser/extensions/extension_web_ui.cc',
       'browser/extensions/extension_web_ui.h',
       'browser/extensions/extension_web_ui_override_registrar.cc',