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

Unified Diff: chrome/browser/chromeos/status/input_method_menu.h

Issue 8438064: Separate StatusAreaView from StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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.h
diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h
index 6d712af40617bef09eb4a022e0b99fc4bd85ac72..29657e2cd5827ee5de4131ed0b03896fdcc8c904 100644
--- a/chrome/browser/chromeos/status/input_method_menu.h
+++ b/chrome/browser/chromeos/status/input_method_menu.h
@@ -9,7 +9,7 @@
#include <string>
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/status/status_area_host.h"
+#include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
#include "chrome/browser/prefs/pref_member.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -35,7 +35,7 @@ namespace chromeos {
// A class for the dropdown menu for switching input method and keyboard layout.
// Since the class provides the views::ViewMenuDelegate interface, it's easy to
-// create a button widget (e.g. views::MenuButton, chromeos::StatusAreaButton)
+// create a button widget (e.g. views::MenuButton, StatusAreaButton)
// which shows the dropdown menu on click.
class InputMethodMenu
: public views::ViewMenuDelegate,
@@ -45,7 +45,7 @@ class InputMethodMenu
public content::NotificationObserver {
public:
InputMethodMenu(PrefService* pref_service,
- StatusAreaHost::ScreenMode screen_mode,
+ StatusAreaViewChromeos::ScreenMode screen_mode,
bool for_out_of_box_experience_dialog);
virtual ~InputMethodMenu();
@@ -193,7 +193,7 @@ class InputMethodMenu
content::NotificationRegistrar registrar_;
// The mode of the host screen (e.g. browser, screen locker, login screen.)
- const StatusAreaHost::ScreenMode screen_mode_;
+ const StatusAreaViewChromeos::ScreenMode screen_mode_;
// true if the menu is for a dialog in OOBE screen. In the dialog, we don't
// use radio buttons.
const bool for_out_of_box_experience_dialog_;
« no previous file with comments | « chrome/browser/chromeos/status/clock_menu_button_browsertest.cc ('k') | chrome/browser/chromeos/status/input_method_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698