Factor Google Now welcome notifications out of DesktopNotificationService.

chrome/browser/notifications/extensions/extension_welcome_notification.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/notifications/extension_welcome_notification.h"
+#include "chrome/browser/notifications/extensions/extension_welcome_notification.h"
 
 #include "base/guid.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_delegate.h"
 #include "ui/message_center/notification_types.h"
 
 const int ExtensionWelcomeNotification::kRequestedShowTimeDays = 14;
+const char ExtensionWelcomeNotification::kChromeNowExtensionID[]=

[robliao, 2014/09/18 20:10:01]

Space between [] and =

+    "pafkbggdmjlpgkdkcbjmhmfcdpncadgh";
 
 namespace {
 
 class NotificationCallbacks
     : public message_center::NotificationDelegate {
  public:
   NotificationCallbacks(
       Profile* profile,
       const message_center::NotifierId notifier_id,
       const std::string& welcome_notification_id,
@@ skipping 88 matching lines @@
     base::MessageLoop::current()->PostTask(from_here, task);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultDelegate);
 };
 
 }  // namespace
 
 ExtensionWelcomeNotification::ExtensionWelcomeNotification(
-    const std::string& extension_id,
     Profile* const profile,
     ExtensionWelcomeNotification::Delegate* const delegate)
-    : notifier_id_(message_center::NotifierId::APPLICATION, extension_id),
+    : notifier_id_(message_center::NotifierId::APPLICATION,
+          ExtensionWelcomeNotification::kChromeNowExtensionID),

[Jun Mukai, 2014/09/18 17:53:48]

You can just say kChromeNowExtensionID because it's in the scope of
ExtensionWelcomeNotification ??
Then it would fit into the previous line.

[Peter Beverloo, 2014/09/19 13:01:22]

I removed the prefix, but since still end up with an 84-character line the break
needs to stay.

       profile_(profile),
       delegate_(delegate) {
   welcome_notification_dismissed_pref_.Init(
       prefs::kWelcomeNotificationDismissed,
       profile_->GetPrefs(),
       base::Bind(
           &ExtensionWelcomeNotification::OnWelcomeNotificationDismissedChanged,
           base::Unretained(this)));
   welcome_notification_dismissed_local_pref_.Init(
       prefs::kWelcomeNotificationDismissedLocal,
       profile_->GetPrefs());
 }
 
 // static
 scoped_ptr<ExtensionWelcomeNotification> ExtensionWelcomeNotification::Create(
-    const std::string& extension_id,
     Profile* const profile) {
-  return Create(extension_id, profile, new DefaultDelegate()).Pass();
+  return Create(profile, new DefaultDelegate()).Pass();
 }
 
 // static
 scoped_ptr<ExtensionWelcomeNotification> ExtensionWelcomeNotification::Create(
-    const std::string& extension_id,
-    Profile* const profile,
-    Delegate* const delegate) {
+    Profile* const profile, Delegate* const delegate) {
   return scoped_ptr<ExtensionWelcomeNotification>(
-      new ExtensionWelcomeNotification(extension_id, profile, delegate)).Pass();
+      new ExtensionWelcomeNotification(profile, delegate)).Pass();
 }
 
 ExtensionWelcomeNotification::~ExtensionWelcomeNotification() {
   if (delayed_notification_) {
     delayed_notification_.reset();
     PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
   } else {
     HideWelcomeNotification();
   }
 }
@@ skipping 181 matching lines @@
       prefs::kWelcomeNotificationExpirationTimestamp,
       (delegate_->GetCurrentTime() +
           base::TimeDelta::FromDays(kRequestedShowTimeDays)).ToInternalValue());
 }
 
 bool ExtensionWelcomeNotification::IsWelcomeNotificationExpired() const {
   const base::Time expiration_timestamp = GetExpirationTimestamp();
   return !expiration_timestamp.is_null() &&
          (expiration_timestamp <= delegate_->GetCurrentTime());
 }