BSD ifdefs, etc. necessary for chrome/

Review URL: http://codereview.chromium.org/656009

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

2 files changed, 14 insertions, 14 deletions

diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 1519581..ef9faae 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -159,12 +159,12 @@ void ExtensionHost::CreateView(Browser* browser) {
   // We own |view_|, so don't auto delete when it's removed from the view
   // hierarchy.
   view_->set_parent_owned(false);
-#elif defined(OS_LINUX)
-  view_.reset(new ExtensionViewGtk(this, browser));
-  view_->Init();
 #elif defined(OS_MACOSX)
   view_.reset(new ExtensionViewMac(this, browser));
   view_->Init();
+#elif defined(TOOLKIT_USES_GTK)
+  view_.reset(new ExtensionViewGtk(this, browser));
+  view_->Init();
 #else
   // TODO(port)
   NOTREACHED();
@@ -450,11 +450,11 @@ gfx::NativeWindow ExtensionHost::GetMessageBoxRootWindow() {
     return platform_util::GetTopLevel(native_view);
 
   // Otherwise, try the active tab's view.
-  TabContents* active_tab = GetBrowser()->GetSelectedTabContents();

-  if (active_tab)

-    return active_tab->view()->GetTopLevelNativeWindow();

-

-  return NULL;

+  TabContents* active_tab = GetBrowser()->GetSelectedTabContents();
+  if (active_tab)
+    return active_tab->view()->GetTopLevelNativeWindow();
+
+  return NULL;
 }
 
 void ExtensionHost::OnMessageBoxClosed(IPC::Message* reply_msg,
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 38f6dbe..a5a0ae0 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -16,10 +16,10 @@
 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
 #if defined(TOOLKIT_VIEWS)
 #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"
+#elif defined(TOOLKIT_GTK)
+#include "chrome/browser/gtk/extension_view_gtk.h"
 #endif
 #include "chrome/common/notification_registrar.h"
 
@@ -56,10 +56,10 @@ class ExtensionHost : public ExtensionPopupHost::PopupDelegate,
 #if defined(TOOLKIT_VIEWS)
   void set_view(ExtensionView* view) { view_.reset(view); }
   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(); }
+#elif defined(TOOLKIT_GTK)
+  ExtensionViewGtk* view() const { return view_.get(); }
 #else
   // TODO(port): implement
   void* view() const { return NULL; }
@@ -224,10 +224,10 @@ class ExtensionHost : public ExtensionPopupHost::PopupDelegate,
   // Optional view that shows the rendered content in the UI.
 #if defined(TOOLKIT_VIEWS)
   scoped_ptr<ExtensionView> view_;
-#elif defined(OS_LINUX)
-  scoped_ptr<ExtensionViewGtk> view_;
 #elif defined(OS_MACOSX)
   scoped_ptr<ExtensionViewMac> view_;
+#elif defined(TOOLKIT_GTK)
+  scoped_ptr<ExtensionViewGtk> view_;
 #endif
 
   // The host for our HTML content.