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

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/keyboard_switch_menu.h" 5 #include "chrome/browser/chromeos/login/keyboard_switch_menu.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/chromeos/cros/cros_library.h" 9 #include "chrome/browser/chromeos/cros/cros_library.h"
10 #include "chrome/browser/chromeos/cros/keyboard_library.h" 10 #include "chrome/browser/chromeos/cros/keyboard_library.h"
11 #include "chrome/browser/chromeos/input_method/input_method_util.h" 11 #include "chrome/browser/chromeos/input_method/input_method_util.h"
12 #include "chrome/browser/chromeos/status/status_area_host.h" 12 #include "chrome/browser/chromeos/status/status_area_host.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
15 #include "views/controls/button/menu_button.h"
15 #include "views/widget/widget_gtk.h" 16 #include "views/widget/widget_gtk.h"
16 17
17 namespace chromeos { 18 namespace chromeos {
18 19
19 KeyboardSwitchMenu::KeyboardSwitchMenu() 20 KeyboardSwitchMenu::KeyboardSwitchMenu()
20 : InputMethodMenu(NULL /* pref_service */, 21 : InputMethodMenu(NULL /* pref_service */,
21 StatusAreaHost::kLoginMode, 22 StatusAreaHost::kLoginMode,
22 true /* for_out_of_box_experience_dialog */) { 23 true /* for_out_of_box_experience_dialog */) {
23 } 24 }
24 25
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 "that matches the hardware keyboard layout"; 60 "that matches the hardware keyboard layout";
60 KeyboardLibrary *library = CrosLibrary::Get()->GetKeyboardLibrary(); 61 KeyboardLibrary *library = CrosLibrary::Get()->GetKeyboardLibrary();
61 const std::string keyboard_layout_id = 62 const std::string keyboard_layout_id =
62 library->GetHardwareKeyboardLayoutName(); 63 library->GetHardwareKeyboardLayoutName();
63 const std::string language_code = 64 const std::string language_code =
64 input_method::GetLanguageCodeFromInputMethodId(keyboard_layout_id); 65 input_method::GetLanguageCodeFromInputMethodId(keyboard_layout_id);
65 return input_method::GetLanguageDisplayNameFromCode(language_code); 66 return input_method::GetLanguageDisplayNameFromCode(language_code);
66 } 67 }
67 68
68 } // namespace chromeos 69 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/keyboard_switch_menu.h ('k') | chrome/browser/chromeos/status/input_method_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698