Removing GTK code from ui/views.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9804001

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

5 files changed, 0 insertions, 23 deletions

diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h
index c8644a3..7897294 100644
--- a/ui/views/focus/accelerator_handler.h
+++ b/ui/views/focus/accelerator_handler.h
@@ -8,10 +8,6 @@
 
 #include "build/build_config.h"
 
-#if defined(TOOLKIT_USES_GTK)
-#include <gdk/gdk.h>
-#endif
-
 #include <set>
 #include <vector>
 
@@ -49,8 +45,6 @@ class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher {
 #elif defined(USE_AURA)
   virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
       XEvent* xev) OVERRIDE;
-#else
-  virtual bool Dispatch(GdkEvent* event) OVERRIDE;
 #endif
 
  private:
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index 317a1a7..b7a4d1b 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -435,12 +435,6 @@ void FocusManager::MaybeResetMenuKeyState(const KeyEvent& key) {
 #endif
 }
 
-#if defined(TOOLKIT_USES_GTK)
-void FocusManager::ResetMenuKeyState() {
-  should_handle_menu_key_release_ = false;
-}
-#endif
-
 ui::AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator(
     const ui::Accelerator& accelerator) const {
   return accelerator_manager_->GetCurrentTarget(accelerator);
diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h
index 262444f..a0baadd 100644
--- a/ui/views/focus/focus_manager.h
+++ b/ui/views/focus/focus_manager.h
@@ -227,11 +227,6 @@ class VIEWS_EXPORT FocusManager {
   // This is effective only on x11.
   void MaybeResetMenuKeyState(const KeyEvent& key);
 
-#if defined(TOOLKIT_USES_GTK)
-  // Resets menu key state. TODO(oshima): Remove this when views/gtk is removed.
-  void ResetMenuKeyState();
-#endif
-
   // Called by a RootView when a view within its hierarchy is removed
   // from its parent. This will only be called by a RootView in a
   // hierarchy of Widgets that this FocusManager is attached to the
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index aea5d19..01a33ab 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -17,10 +17,6 @@
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #endif
 
-#if defined(OS_LINUX)
-#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
-#endif
-
 namespace views {
 
 enum FocusTestEventType {
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index fc58df8..f0ef1f4 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -159,8 +159,6 @@ class BorderView : public NativeViewHost {
         Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
 #if defined(OS_WIN) || defined(USE_AURA)
         params.parent = parent->GetWidget()->GetNativeView();
-#elif defined(TOOLKIT_USES_GTK)
-        params.parent = native_view();
 #else
         NOTREACHED();
 #endif