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

Unified 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 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 6867d440223130df26fef410a3947efedabd949d..a443c2458d2a0889e828f98e93396e20186ab894 100644
--- a/chrome/browser/chromeos/status/input_method_menu_button.h
+++ b/chrome/browser/chromeos/status/input_method_menu_button.h
@@ -11,7 +11,6 @@
#include "base/compiler_specific.h"
#include "chrome/browser/chromeos/status/input_method_menu.h"
#include "chrome/browser/chromeos/status/status_area_button.h"
-#include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
#include "views/controls/menu/view_menu_delegate.h"
namespace chromeos {
@@ -21,9 +20,7 @@ namespace chromeos {
class InputMethodMenuButton : public StatusAreaButton,
public views::ViewMenuDelegate {
public:
- explicit InputMethodMenuButton(
- StatusAreaButton::Delegate* delegate,
- StatusAreaViewChromeos::ScreenMode screen_mode);
+ explicit InputMethodMenuButton(StatusAreaButton::Delegate* delegate);
virtual ~InputMethodMenuButton();
// views::View implementation.
@@ -49,7 +46,6 @@ class InputMethodMenuButton : public StatusAreaButton,
bool WindowIsActive();
scoped_ptr<InputMethodMenu> menu_;
- StatusAreaViewChromeos::ScreenMode screen_mode_;
DISALLOW_COPY_AND_ASSIGN(InputMethodMenuButton);
};
« no previous file with comments | « chrome/browser/chromeos/status/input_method_menu.cc ('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