chrome/browser/chromeos/login/keyboard_switch_menu.cc - Issue 6262012: Remove multiple inheritance from input_method_menu_button.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/keyboard_switch_menu.cc

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:

Index: chrome/browser/chromeos/login/keyboard_switch_menu.cc

diff --git a/chrome/browser/chromeos/login/keyboard_switch_menu.cc b/chrome/browser/chromeos/login/keyboard_switch_menu.cc

index 278d578b2997305058f051ffcbeb5d2918f0f35f..5e29ce54392cb02485f1d0059fa2f28dd6f77e8e 100644

--- a/chrome/browser/chromeos/login/keyboard_switch_menu.cc

+++ b/chrome/browser/chromeos/login/keyboard_switch_menu.cc

@@ -12,6 +12,7 @@

#include "chrome/browser/chromeos/status/status_area_host.h"

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

+#include "views/controls/button/menu_button.h"

#include "views/widget/widget_gtk.h"

namespace chromeos {