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

Side by Side Diff: chrome/browser/chromeos/login/keyboard_switch_menu.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/keyboard_switch_menu.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_KEYBOARD_SWITCH_MENU_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_KEYBOARD_SWITCH_MENU_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_KEYBOARD_SWITCH_MENU_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_KEYBOARD_SWITCH_MENU_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/scoped_ptr.h" 11 #include "base/scoped_ptr.h"
12 #include "chrome/browser/chromeos/status/input_method_menu_button.h" 12 #include "chrome/browser/chromeos/status/input_method_menu.h"
13 #include "chrome/browser/chromeos/status/status_area_host.h" 13 #include "chrome/browser/chromeos/status/status_area_host.h"
14 14
15 namespace chromeos { 15 namespace chromeos {
16 16
17 // A class for the button in the OOBE network configuration screen which expands 17 // A class for the button in the OOBE network configuration screen which expands
18 // a dropdown menu for switching keyboard layout. Note that the InputMethodMenu 18 // a dropdown menu for switching keyboard layout. Note that the InputMethodMenu
19 // class implements the views::ViewMenuDelegate interface. 19 // class implements the views::ViewMenuDelegate interface.
20 class KeyboardSwitchMenu : public InputMethodMenu { 20 class KeyboardSwitchMenu : public InputMethodMenu {
21 public: 21 public:
22 KeyboardSwitchMenu(); 22 KeyboardSwitchMenu();
(...skipping 14 matching lines...) Expand all
37 // Returns current keyboard name to be placed on the keyboard menu-button. 37 // Returns current keyboard name to be placed on the keyboard menu-button.
38 string16 GetCurrentKeyboardName() const; 38 string16 GetCurrentKeyboardName() const;
39 39
40 private: 40 private:
41 DISALLOW_COPY_AND_ASSIGN(KeyboardSwitchMenu); 41 DISALLOW_COPY_AND_ASSIGN(KeyboardSwitchMenu);
42 }; 42 };
43 43
44 } // namespace chromeos 44 } // namespace chromeos
45 45
46 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_KEYBOARD_SWITCH_MENU_H_ 46 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_KEYBOARD_SWITCH_MENU_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/keyboard_switch_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698