Fixed some styling issues and added missing header files.

chrome/browser/chromeos/policy/consumer_management_notifier.cc

 // Copyright 2014 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/policy/consumer_management_notifier.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/WebKit/public/web/WebTextDirection.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
+#include "ui/message_center/notification_types.h"
 #include "ui/message_center/notifier_settings.h"
 #include "url/gurl.h"
 
 namespace {
 
 // Desktop notification constants.
 const char kEnrollmentNotificationId[] = "consumer_management.enroll";
 const char kEnrollmentNotificationUrl[] = "chrome://consumer-management/enroll";
 
 // The path to the consumer management enrollment/unenrollment confirmation
 // overlay, relative to the settings page URL.
 const char kConsumerManagementOverlay[] = "consumer-management-overlay";
 
 class DesktopNotificationDelegate : public NotificationDelegate {
  public:
   // |button_click_callback| is called when the button in the notification is
   // clicked.
   DesktopNotificationDelegate(const std::string& id,
                               const base::Closure& button_click_callback);
 
   // NotificationDelegate:
   std::string id() const override;
   void ButtonClick(int button_index) override;
 
  private:
   ~DesktopNotificationDelegate() override;
 
-  std::string id_;
-  base::Closure button_click_callback_;
+  const std::string id_;
+  const base::Closure button_click_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNotificationDelegate);
 };
 
 DesktopNotificationDelegate::DesktopNotificationDelegate(
     const std::string& id,
     const base::Closure& button_click_callback)
     : id_(id), button_click_callback_(button_click_callback) {
 }
 
@@ skipping 24 matching lines @@
 
 ConsumerManagementNotifier::~ConsumerManagementNotifier() {
 }
 
 void ConsumerManagementNotifier::Shutdown() {
   consumer_management_service_->RemoveObserver(this);
 }
 
 void ConsumerManagementNotifier::OnConsumerManagementStatusChanged() {
   if (consumer_management_service_->HasPendingEnrollmentNotification()) {
-    ConsumerManagementService::EnrollmentStage stage =
+    const ConsumerManagementService::EnrollmentStage stage =
         consumer_management_service_->GetEnrollmentStage();
     // Reset the enrollment stage so that we won't show the same notification,
     // again.
     consumer_management_service_->SetEnrollmentStage(
         ConsumerManagementService::ENROLLMENT_STAGE_NONE);
     ShowDesktopNotification(stage);
   }
 }
 
 void ConsumerManagementNotifier::ShowDesktopNotification(
@@ skipping 56 matching lines @@
 void ConsumerManagementNotifier::TryEnrollmentAgain() const {
   const GURL base_url(chrome::kChromeUISettingsURL);
   const GURL url = base_url.Resolve(kConsumerManagementOverlay);
 
   chrome::NavigateParams params(profile_, url, ui::PAGE_TRANSITION_LINK);
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
 }
 
 }  // namespace policy