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

Unified Diff: chrome/browser/chromeos/login/touch_login_view.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/touch_login_view.cc
===================================================================
--- chrome/browser/chromeos/login/touch_login_view.cc (revision 91880)
+++ chrome/browser/chromeos/login/touch_login_view.cc (working copy)
@@ -53,16 +53,16 @@
InitVirtualKeyboard();
registrar_.Add(this,
- NotificationType::FOCUS_CHANGED_IN_PAGE,
+ chrome::FOCUS_CHANGED_IN_PAGE,
NotificationService::AllSources());
registrar_.Add(this,
- NotificationType::TAB_CONTENTS_DESTROYED,
+ chrome::TAB_CONTENTS_DESTROYED,
NotificationService::AllSources());
registrar_.Add(this,
- NotificationType::HIDE_KEYBOARD_INVOKED,
+ chrome::HIDE_KEYBOARD_INVOKED,
NotificationService::AllSources());
registrar_.Add(this,
- NotificationType::SET_KEYBOARD_HEIGHT_INVOKED,
+ chrome::SET_KEYBOARD_HEIGHT_INVOKED,
NotificationService::AllSources());
}
@@ -150,10 +150,10 @@
return NONE;
}
-void TouchLoginView::Observe(NotificationType type,
+void TouchLoginView::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- if (type == NotificationType::FOCUS_CHANGED_IN_PAGE) {
+ if (type == chrome::FOCUS_CHANGED_IN_PAGE) {
// Only modify the keyboard state if the currently active tab sent the
// notification.
const TabContents* current_tab = webui_login_->tab_contents();
@@ -167,12 +167,12 @@
// can be determined after tab switching.
GetFocusedStateAccessor()->SetProperty(
source_tab->property_bag(), editable);
- } else if (type == NotificationType::TAB_CONTENTS_DESTROYED) {
+ } else if (type == chrome::TAB_CONTENTS_DESTROYED) {
GetFocusedStateAccessor()->DeleteProperty(
Source<TabContents>(source).ptr()->property_bag());
- } else if (type == NotificationType::HIDE_KEYBOARD_INVOKED) {
+ } else if (type == chrome::HIDE_KEYBOARD_INVOKED) {
UpdateKeyboardAndLayout(false);
- } else if (type == NotificationType::SET_KEYBOARD_HEIGHT_INVOKED) {
+ } else if (type == chrome::SET_KEYBOARD_HEIGHT_INVOKED) {
// TODO(penghuang) Allow extension conrtol the virtual keyboard directly
// instead of using Notification.
int height = *(Details<int>(details).ptr());

Powered by Google App Engine
This is Rietveld 408576698