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

Unified Diff: chrome/browser/extensions/extension_host.h

Issue 175025: Add a bare-bones extension shelf that displays extension items on OS X. (Closed)
Patch Set: Merge ToT, address more comments Created 11 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
« no previous file with comments | « chrome/browser/cocoa/status_bubble_mac.mm ('k') | chrome/browser/extensions/extension_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_host.h
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index b6e25e530ad42e39dc6a86bd5a49805526bce238..49a75f1ffa6c040f6b2093a36605f4325b2ec3d0 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -15,6 +15,8 @@
#include "chrome/browser/views/extensions/extension_view.h"
#elif defined(OS_LINUX)
#include "chrome/browser/gtk/extension_view_gtk.h"
+#elif defined(OS_MACOSX)
+#include "chrome/browser/cocoa/extension_view_mac.h"
#endif
#include "chrome/common/notification_registrar.h"
@@ -48,6 +50,8 @@ class ExtensionHost : public RenderViewHostDelegate,
ExtensionView* view() const { return view_.get(); }
#elif defined(OS_LINUX)
ExtensionViewGtk* view() const { return view_.get(); }
+#elif defined(OS_MACOSX)
+ ExtensionViewMac* view() const { return view_.get(); }
#else
// TODO(port): implement
void* view() const { return NULL; }
@@ -158,6 +162,8 @@ class ExtensionHost : public RenderViewHostDelegate,
scoped_ptr<ExtensionView> view_;
#elif defined(OS_LINUX)
scoped_ptr<ExtensionViewGtk> view_;
+#elif defined(OS_MACOSX)
+ scoped_ptr<ExtensionViewMac> view_;
#endif
// The host for our HTML content.
« no previous file with comments | « chrome/browser/cocoa/status_bubble_mac.mm ('k') | chrome/browser/extensions/extension_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698