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

Unified Diff: chrome/browser/chromeos/options/take_photo_dialog.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/options/take_photo_dialog.cc
===================================================================
--- chrome/browser/chromeos/options/take_photo_dialog.cc (revision 91971)
+++ chrome/browser/chromeos/options/take_photo_dialog.cc (working copy)
@@ -8,8 +8,8 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/common/chrome_notification_types.h"
#include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
@@ -34,7 +34,7 @@
camera_controller_.set_frame_height(kFrameHeight);
registrar_.Add(
this,
- NotificationType::SCREEN_LOCK_STATE_CHANGED,
+ chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
NotificationService::AllSources());
}
@@ -109,10 +109,10 @@
take_photo_view_->ShowCameraError();
}
-void TakePhotoDialog::Observe(NotificationType type,
+void TakePhotoDialog::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- if (type != NotificationType::SCREEN_LOCK_STATE_CHANGED)
+ if (type != chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED)
return;
bool is_screen_locked = *Details<bool>(details).ptr();
« no previous file with comments | « chrome/browser/chromeos/options/take_photo_dialog.h ('k') | chrome/browser/chromeos/panels/panel_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698