aura: Make 'aura_shell_exe' work without gtk.

BUG=97131
TEST=none

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

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

5 files changed, 77 insertions, 5 deletions

diff --git a/ui/aura_shell/aura_shell_main.cc b/ui/aura_shell/aura_shell_main.cc
index 43c7b6b..3dd75c59 100644
--- a/ui/aura_shell/aura_shell_main.cc
+++ b/ui/aura_shell/aura_shell_main.cc
@@ -22,7 +22,7 @@ int main(int argc, char** argv) {
   icu_util::Initialize();
   ResourceBundle::InitSharedInstance("en-US");
 
-#if defined(USE_X11)
+#if defined(TOOLKIT_USES_GTK)
   base::MessagePumpX::DisableGtkMessagePump();
 #endif
 
diff --git a/ui/aura_shell/examples/window_type_launcher.cc b/ui/aura_shell/examples/window_type_launcher.cc
index a9eb50d..1957ad2 100644
--- a/ui/aura_shell/examples/window_type_launcher.cc
+++ b/ui/aura_shell/examples/window_type_launcher.cc
@@ -108,9 +108,10 @@ void WindowTypeLauncher::ShowContextMenuForView(views::View* source,
   root->AppendMenuItem(COMMAND_NEW_WINDOW, L"New Window", MenuItemView::NORMAL);
   // MenuRunner takes ownership of root.
   menu_runner_.reset(new MenuRunner(root));
-  menu_runner_->RunMenuAt(
-      GetWidget(), NULL, gfx::Rect(p, gfx::Size(0, 0)),
-      MenuItemView::TOPLEFT, MenuRunner::HAS_MNEMONICS);
+  if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(p, gfx::Size(0, 0)),
+        MenuItemView::TOPLEFT,
+        MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
+    return;
 }
 
 }  // namespace examples
diff --git a/ui/aura_shell/toplevel_frame_view.cc b/ui/aura_shell/toplevel_frame_view.cc
index 02b2d1b..526893f 100644
--- a/ui/aura_shell/toplevel_frame_view.cc
+++ b/ui/aura_shell/toplevel_frame_view.cc
@@ -275,7 +275,6 @@ gfx::Rect ToplevelFrameView::GetWindowBoundsForClientBounds(
 }
 
 int ToplevelFrameView::NonClientHitTest(const gfx::Point& point) {
-  int old_hittest_code = current_hittest_code_;
   current_hittest_code_ = NonClientHitTestImpl(point);
   return current_hittest_code_;
 }
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.cc b/ui/base/dragdrop/os_exchange_data_provider_aura.cc
new file mode 100644
index 0000000..78d5a9d
--- /dev/null
+++ b/ui/base/dragdrop/os_exchange_data_provider_aura.cc
@@ -0,0 +1,71 @@
+// Copyright (c) 2011 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 "ui/base/dragdrop/os_exchange_data.h"
+
+#include "base/logging.h"
+
+namespace ui {
+
+// OSExchangeData::Provider implementation for aura on linux.
+class OSExchangeDataProviderAura : public OSExchangeData::Provider {
+ public:
+  OSExchangeDataProviderAura() {
+    NOTIMPLEMENTED();
+  }
+
+  virtual ~OSExchangeDataProviderAura() {
+  }
+
+  virtual void SetString(const string16& data) OVERRIDE {
+  }
+  virtual void SetURL(const GURL& url, const string16& title) OVERRIDE {
+  }
+  virtual void SetFilename(const FilePath& path) OVERRIDE {
+  }
+  virtual void SetPickledData(OSExchangeData::CustomFormat format,
+                              const Pickle& data) OVERRIDE {
+  }
+
+  virtual bool GetString(string16* data) const OVERRIDE {
+    return false;
+  }
+  virtual bool GetURLAndTitle(GURL* url, string16* title) const OVERRIDE {
+    return false;
+  }
+  virtual bool GetFilename(FilePath* path) const OVERRIDE {
+    return false;
+  }
+  virtual bool GetPickledData(OSExchangeData::CustomFormat format,
+                              Pickle* data) const OVERRIDE {
+    return false;
+  }
+
+  virtual bool HasString() const OVERRIDE {
+    return false;
+  }
+  virtual bool HasURL() const OVERRIDE {
+    return false;
+  }
+  virtual bool HasFile() const OVERRIDE {
+    return false;
+  }
+  virtual bool HasCustomFormat(
+      OSExchangeData::CustomFormat format) const OVERRIDE {
+    return false;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderAura);
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// OSExchangeData, public:
+
+// static
+OSExchangeData::Provider* OSExchangeData::CreateProvider() {
+  return new OSExchangeDataProviderAura();
+}
+
+}  // namespace ui
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 042802d..6294be8 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -100,6 +100,7 @@
         'base/dragdrop/gtk_dnd_util.h',
         'base/dragdrop/os_exchange_data.cc',
         'base/dragdrop/os_exchange_data.h',
+        'base/dragdrop/os_exchange_data_provider_aura.cc',
         'base/dragdrop/os_exchange_data_provider_gtk.cc',
         'base/dragdrop/os_exchange_data_provider_gtk.h',
         'base/dragdrop/os_exchange_data_provider_win.cc',