Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

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/common/chrome_notification_types.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.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(Delegate* delegate)
     : take_photo_view_(NULL),
       camera_controller_(this),
       delegate_(delegate) {
   camera_controller_.set_frame_width(kFrameWidth);
   camera_controller_.set_frame_height(kFrameHeight);
   registrar_.Add(
       this,
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 }
 
 TakePhotoDialog::~TakePhotoDialog() {
 }
 
 bool TakePhotoDialog::IsDialogButtonEnabled(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_CANCEL)
     return true;
   else if (button == MessageBoxFlags::DIALOGBUTTON_OK)
@@ skipping 113 matching lines @@
 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