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

chrome/browser/chromeos/login/user_image_screen.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/login/user_image_screen.h"
 
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.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
 
 UserImageScreen::UserImageScreen(ScreenObserver* screen_observer,
                                  UserImageScreenActor* actor)
     : WizardScreen(screen_observer),
       camera_controller_(this),
       actor_(actor) {
   actor_->SetDelegate(this);
   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());
 }
 
 UserImageScreen::~UserImageScreen() {
   if (actor_)
     actor_->SetDelegate(NULL);
 }
 
 void UserImageScreen::PrepareToShow() {
   if (actor_)
     actor_->PrepareToShow();
@@ skipping 127 matching lines @@
     StartCamera();
 }
 
 void UserImageScreen::OnDownloadSuccess(const SkBitmap& image) {
   // TODO(avayvod): Check for the default image.
   if (actor_)
     actor_->AddProfileImage(image);
 }
 
 }  // namespace chromeos