| Index: chrome/browser/sessions/session_restore.cc
|
| ===================================================================
|
| --- chrome/browser/sessions/session_restore.cc (revision 91771)
|
| +++ chrome/browser/sessions/session_restore.cc (working copy)
|
| @@ -26,6 +26,7 @@
|
| #include "chrome/browser/ui/browser_list.h"
|
| #include "chrome/browser/ui/browser_navigator.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "content/browser/renderer_host/render_widget_host.h"
|
| #include "content/browser/renderer_host/render_widget_host_view.h"
|
| #include "content/browser/tab_contents/navigation_controller.h"
|
| @@ -185,7 +186,7 @@
|
| LoadNextTab();
|
| } else {
|
| // Start listening to network state notification now.
|
| - registrar_.Add(this, NotificationType::NETWORK_STATE_CHANGED,
|
| + registrar_.Add(this, chrome::NETWORK_STATE_CHANGED,
|
| NotificationService::AllSources());
|
| }
|
| #else
|
| @@ -232,7 +233,7 @@
|
| const NotificationDetails& details) {
|
| switch (type.value) {
|
| #if defined(OS_CHROMEOS)
|
| - case NotificationType::NETWORK_STATE_CHANGED: {
|
| + case chrome::NETWORK_STATE_CHANGED: {
|
| chromeos::NetworkStateDetails* state_details =
|
| Details<chromeos::NetworkStateDetails>(details).ptr();
|
| switch (state_details->state()) {
|
| @@ -447,7 +448,7 @@
|
| }
|
|
|
| if (browser_) {
|
| - registrar_.Add(this, NotificationType::BROWSER_CLOSED,
|
| + registrar_.Add(this, chrome::BROWSER_CLOSED,
|
| Source<Browser>(browser_));
|
| }
|
|
|
| @@ -503,7 +504,7 @@
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| switch (type.value) {
|
| - case NotificationType::BROWSER_CLOSED:
|
| + case chrome::BROWSER_CLOSED:
|
| delete this;
|
| return;
|
|
|
|
|