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

Side by Side Diff: chrome/browser/chromeos/status/input_method_menu_button.h

Issue 8585031: [cros, Aura] Make screen_mode static variable in StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_STATUS_INPUT_METHOD_MENU_BUTTON_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_BUTTON_H_
6 #define CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_BUTTON_H_ 6 #define CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_BUTTON_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "chrome/browser/chromeos/status/input_method_menu.h" 12 #include "chrome/browser/chromeos/status/input_method_menu.h"
13 #include "chrome/browser/chromeos/status/status_area_button.h" 13 #include "chrome/browser/chromeos/status/status_area_button.h"
14 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
15 #include "views/controls/menu/view_menu_delegate.h" 14 #include "views/controls/menu/view_menu_delegate.h"
16 15
17 namespace chromeos { 16 namespace chromeos {
18 17
19 // A class for the button in the status area which expands the dropdown menu for 18 // A class for the button in the status area which expands the dropdown menu for
20 // switching input method and keyboard layout. 19 // switching input method and keyboard layout.
21 class InputMethodMenuButton : public StatusAreaButton, 20 class InputMethodMenuButton : public StatusAreaButton,
22 public views::ViewMenuDelegate { 21 public views::ViewMenuDelegate {
23 public: 22 public:
24 explicit InputMethodMenuButton( 23 explicit InputMethodMenuButton(StatusAreaButton::Delegate* delegate);
25 StatusAreaButton::Delegate* delegate,
26 StatusAreaViewChromeos::ScreenMode screen_mode);
27 virtual ~InputMethodMenuButton(); 24 virtual ~InputMethodMenuButton();
28 25
29 // views::View implementation. 26 // views::View implementation.
30 virtual void OnLocaleChanged(); 27 virtual void OnLocaleChanged();
31 28
32 // views::ViewMenuDelegate implementation. 29 // views::ViewMenuDelegate implementation.
33 virtual void RunMenu(views::View* unused_source, const gfx::Point& pt); 30 virtual void RunMenu(views::View* unused_source, const gfx::Point& pt);
34 31
35 // InputMethodMenu implementation. 32 // InputMethodMenu implementation.
36 virtual void UpdateUI(const std::string& input_method_id, 33 virtual void UpdateUI(const std::string& input_method_id,
37 const string16& name, 34 const string16& name,
38 const string16& tooltip, 35 const string16& tooltip,
39 size_t num_active_input_methods); 36 size_t num_active_input_methods);
40 virtual bool ShouldSupportConfigUI(); 37 virtual bool ShouldSupportConfigUI();
41 virtual void OpenConfigUI(); 38 virtual void OpenConfigUI();
42 39
43 // Updates the UI from the current input method. 40 // Updates the UI from the current input method.
44 void UpdateUIFromCurrentInputMethod(); 41 void UpdateUIFromCurrentInputMethod();
45 42
46 private: 43 private:
47 // Returns true if the Chrome window where the button lives is active. 44 // Returns true if the Chrome window where the button lives is active.
48 bool WindowIsActive(); 45 bool WindowIsActive();
49 46
50 scoped_ptr<InputMethodMenu> menu_; 47 scoped_ptr<InputMethodMenu> menu_;
51 StatusAreaViewChromeos::ScreenMode screen_mode_;
52 48
53 DISALLOW_COPY_AND_ASSIGN(InputMethodMenuButton); 49 DISALLOW_COPY_AND_ASSIGN(InputMethodMenuButton);
54 }; 50 };
55 51
56 } // namespace chromeos 52 } // namespace chromeos
57 53
58 #endif // CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_BUTTON_H_ 54 #endif // CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698