Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/chromeos/options/take_photo_dialog.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
 
 #include "base/string_util.h"
 #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"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/layout/layout_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 // The resolution of the picture we want to get from the camera.
 const int kFrameWidth = 480;
 const int kFrameHeight = 480;
 
 }  // namespace
 
 TakePhotoDialog::TakePhotoDialog()
     : take_photo_view_(NULL),
       camera_controller_(this) {
   camera_controller_.set_frame_width(kFrameWidth);
   camera_controller_.set_frame_height(kFrameHeight);
   registrar_.Add(
       this,
-      NotificationType::SCREEN_LOCK_STATE_CHANGED,
+      chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       NotificationService::AllSources());
 }
 
 bool TakePhotoDialog::IsDialogButtonEnabled(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_CANCEL)
     return true;
   else if (button == MessageBoxFlags::DIALOGBUTTON_OK)
     return !take_photo_view_->is_capturing();
   NOTREACHED();
@@ skipping 54 matching lines @@
   SkBitmap frame;
   camera_controller_.GetFrame(&frame);
   if (!frame.isNull())
     take_photo_view_->UpdateVideoFrame(frame);
 }
 
 void TakePhotoDialog::OnCaptureFailure() {
   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();
   if (is_screen_locked)
     camera_controller_.Stop();
   else
     InitCamera();
 }
 
 void TakePhotoDialog::Layout() {
   int left = views::kPanelHorizMargin;
   int top = views::kPanelVertMargin;
   int contents_width = width() - 2 * left;
   int contents_height = height() - 2 * top;
   take_photo_view_->SetBounds(left, top, contents_width, contents_height);
 }
 
 gfx::Size TakePhotoDialog::GetPreferredSize() {
   return gfx::Size(login::kUserImageSize * 2, (login::kUserImageSize * 3 / 2));
 }
 
 void TakePhotoDialog::InitCamera() {
   take_photo_view_->ShowCameraInitializing();
   camera_controller_.Start();
 }
 
 }  // namespace chromeos