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

Unified Diff: views/controls/combobox/native_combobox_gtk.h

Issue 8682011: views: Move combobox directory to ui/views/controls/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « views/controls/combobox/combobox_listener.h ('k') | views/controls/combobox/native_combobox_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/combobox/native_combobox_gtk.h
diff --git a/views/controls/combobox/native_combobox_gtk.h b/views/controls/combobox/native_combobox_gtk.h
deleted file mode 100644
index a55bb9133c7f9765424c2c2f44c58a6389166c9d..0000000000000000000000000000000000000000
--- a/views/controls/combobox/native_combobox_gtk.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// 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.
-
-#ifndef VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
-#define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
-#pragma once
-
-#include "ui/base/gtk/gtk_signal.h"
-#include "views/controls/combobox/native_combobox_wrapper.h"
-#include "views/controls/native_control_gtk.h"
-
-namespace views {
-
-class NativeComboboxGtk : public NativeControlGtk,
- public NativeComboboxWrapper {
- public:
- explicit NativeComboboxGtk(Combobox* combobox);
- virtual ~NativeComboboxGtk();
-
- // Overridden from NativeComboboxWrapper:
- virtual void UpdateFromModel() OVERRIDE;
- virtual void UpdateSelectedItem() OVERRIDE;
- virtual void UpdateEnabled() OVERRIDE;
- virtual int GetSelectedItem() const OVERRIDE;
- virtual bool IsDropdownOpen() const OVERRIDE;
- virtual gfx::Size GetPreferredSize() OVERRIDE;
- virtual View* GetView() OVERRIDE;
- virtual void SetFocus() OVERRIDE;
- virtual bool HandleKeyPressed(const views::KeyEvent& event) OVERRIDE;
- virtual bool HandleKeyReleased(const views::KeyEvent& event) OVERRIDE;
- virtual void HandleFocus() OVERRIDE;
- virtual void HandleBlur() OVERRIDE;
- virtual gfx::NativeView GetTestingHandle() const OVERRIDE;
-
- protected:
- // Overridden from NativeControlGtk:
- virtual void CreateNativeControl() OVERRIDE;
- virtual void NativeControlCreated(GtkWidget* widget) OVERRIDE;
-
- private:
- void SelectionChanged();
- void FocusedMenuItemChanged();
-
- CHROMEGTK_CALLBACK_0(NativeComboboxGtk, void, CallChanged);
- CHROMEGTK_CALLBACK_0(NativeComboboxGtk, gboolean, CallPopUp);
- CHROMEGTK_CALLBACK_1(NativeComboboxGtk, void, CallMenuMoveCurrent,
- GtkMenuDirectionType);
-
- // The combobox we are bound to.
- Combobox* combobox_;
-
- // The combo box's pop-up menu.
- GtkMenu* menu_;
-
- // The preferred size from the last size_request.
- gfx::Size preferred_size_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeComboboxGtk);
-};
-
-} // namespace views
-
-#endif // VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
« no previous file with comments | « views/controls/combobox/combobox_listener.h ('k') | views/controls/combobox/native_combobox_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698