| Index: chrome/browser/sessions/session_service.cc
|
| ===================================================================
|
| --- chrome/browser/sessions/session_service.cc (revision 91771)
|
| +++ chrome/browser/sessions/session_service.cc (working copy)
|
| @@ -28,6 +28,7 @@
|
| #include "chrome/browser/ui/browser_list.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "content/browser/tab_contents/navigation_details.h"
|
| #include "content/browser/tab_contents/navigation_entry.h"
|
| @@ -445,10 +446,10 @@
|
| bool had_commands = !pending_commands().empty();
|
| BaseSessionService::Save();
|
| if (had_commands) {
|
| - RecordSessionUpdateHistogramData(NotificationType::SESSION_SERVICE_SAVED,
|
| + RecordSessionUpdateHistogramData(chrome::SESSION_SERVICE_SAVED,
|
| &last_updated_save_time_);
|
| NotificationService::current()->Notify(
|
| - NotificationType::SESSION_SERVICE_SAVED,
|
| + chrome::SESSION_SERVICE_SAVED,
|
| Source<Profile>(profile()),
|
| NotificationService::NoDetails());
|
| }
|
| @@ -466,10 +467,10 @@
|
| NotificationService::AllSources());
|
| registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
|
| NotificationService::AllSources());
|
| - registrar_.Add(this, NotificationType::BROWSER_OPENED,
|
| + registrar_.Add(this, chrome::BROWSER_OPENED,
|
| NotificationService::AllSources());
|
| registrar_.Add(this,
|
| - NotificationType::TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
|
| + chrome::TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
|
| NotificationService::AllSources());
|
| }
|
|
|
| @@ -508,7 +509,7 @@
|
| const NotificationDetails& details) {
|
| // All of our messages have the NavigationController as the source.
|
| switch (type.value) {
|
| - case NotificationType::BROWSER_OPENED: {
|
| + case chrome::BROWSER_OPENED: {
|
| Browser* browser = Source<Browser>(source).ptr();
|
| if (browser->profile() != profile() ||
|
| !should_track_changes_for_browser_type(browser->type())) {
|
| @@ -608,7 +609,7 @@
|
| break;
|
| }
|
|
|
| - case NotificationType::TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: {
|
| + case chrome::TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: {
|
| ExtensionTabHelper* extension_tab_helper =
|
| Source<ExtensionTabHelper>(source).ptr();
|
| if (extension_tab_helper->extension_app()) {
|
| @@ -1362,7 +1363,7 @@
|
| use_long_period = true;
|
| }
|
| switch (type.value) {
|
| - case NotificationType::SESSION_SERVICE_SAVED :
|
| + case chrome::SESSION_SERVICE_SAVED :
|
| RecordUpdatedSaveTime(delta, use_long_period);
|
| RecordUpdatedSessionNavigationOrTab(delta, use_long_period);
|
| break;
|
|
|