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

Unified Diff: chrome/browser/chromeos/status/input_method_menu_button.h

Issue 6262012: Remove multiple inheritance from input_method_menu_button.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 11 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
Index: chrome/browser/chromeos/status/input_method_menu_button.h
diff --git a/chrome/browser/chromeos/status/input_method_menu_button.h b/chrome/browser/chromeos/status/input_method_menu_button.h
index 3a232eb13fc1967c1026303f692dfb053428d834..325b63b5a384814d23ac0a8f12c13e5d20e5bcda 100644
--- a/chrome/browser/chromeos/status/input_method_menu_button.h
+++ b/chrome/browser/chromeos/status/input_method_menu_button.h
@@ -10,6 +10,7 @@
#include "chrome/browser/chromeos/status/input_method_menu.h"
#include "chrome/browser/chromeos/status/status_area_button.h"
+#include "views/controls/menu/view_menu_delegate.h"
namespace chromeos {
@@ -18,7 +19,7 @@ class StatusAreaHost;
// A class for the button in the status area which expands the dropdown menu for
// switching input method and keyboard layout.
class InputMethodMenuButton : public StatusAreaButton,
- public InputMethodMenu {
+ public views::ViewMenuDelegate {
public:
explicit InputMethodMenuButton(StatusAreaHost* host);
virtual ~InputMethodMenuButton() {}
@@ -27,7 +28,9 @@ class InputMethodMenuButton : public StatusAreaButton,
virtual gfx::Size GetPreferredSize();
virtual void OnLocaleChanged();
- private:
+ // views::ViewMenuDelegate implementation.
+ virtual void RunMenu(views::View* unused_source, const gfx::Point& pt);
+
// InputMethodMenu implementation.
virtual void UpdateUI(const std::string& input_method_id,
const std::wstring& name,
@@ -36,6 +39,8 @@ class InputMethodMenuButton : public StatusAreaButton,
virtual bool ShouldSupportConfigUI();
virtual void OpenConfigUI();
+ private:
+ scoped_ptr<InputMethodMenu> menu_;
StatusAreaHost* host_;
DISALLOW_COPY_AND_ASSIGN(InputMethodMenuButton);
« no previous file with comments | « chrome/browser/chromeos/status/input_method_menu.h ('k') | chrome/browser/chromeos/status/input_method_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698