| Index: chrome/browser/ui/webui/options/extension_settings_handler.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/options/extension_settings_handler.cc (revision 91771)
|
| +++ chrome/browser/ui/webui/options/extension_settings_handler.cc (working copy)
|
| @@ -397,31 +397,31 @@
|
|
|
| // Register for notifications that we need to reload the page.
|
| registrar_.RemoveAll();
|
| - registrar_.Add(this, NotificationType::EXTENSION_LOADED,
|
| + registrar_.Add(this, chrome::EXTENSION_LOADED,
|
| NotificationService::AllSources());
|
| - registrar_.Add(this, NotificationType::EXTENSION_PROCESS_CREATED,
|
| + registrar_.Add(this, chrome::EXTENSION_PROCESS_CREATED,
|
| NotificationService::AllSources());
|
| - registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
|
| + registrar_.Add(this, chrome::EXTENSION_UNLOADED,
|
| NotificationService::AllSources());
|
| - registrar_.Add(this, NotificationType::EXTENSION_UPDATE_DISABLED,
|
| + registrar_.Add(this, chrome::EXTENSION_UPDATE_DISABLED,
|
| NotificationService::AllSources());
|
| registrar_.Add(this,
|
| - NotificationType::NAV_ENTRY_COMMITTED,
|
| + chrome::NAV_ENTRY_COMMITTED,
|
| NotificationService::AllSources());
|
| registrar_.Add(this,
|
| - NotificationType::RENDER_VIEW_HOST_CREATED,
|
| + chrome::RENDER_VIEW_HOST_CREATED,
|
| NotificationService::AllSources());
|
| registrar_.Add(this,
|
| - NotificationType::RENDER_VIEW_HOST_DELETED,
|
| + chrome::RENDER_VIEW_HOST_DELETED,
|
| NotificationService::AllSources());
|
| registrar_.Add(this,
|
| - NotificationType::BACKGROUND_CONTENTS_NAVIGATED,
|
| + chrome::BACKGROUND_CONTENTS_NAVIGATED,
|
| NotificationService::AllSources());
|
| registrar_.Add(this,
|
| - NotificationType::BACKGROUND_CONTENTS_DELETED,
|
| + chrome::BACKGROUND_CONTENTS_DELETED,
|
| NotificationService::AllSources());
|
| registrar_.Add(this,
|
| - NotificationType::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
|
| + chrome::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
|
| NotificationService::AllSources());
|
| }
|
|
|
| @@ -728,22 +728,22 @@
|
| //
|
| // Doing it this way gets everything but causes the page to be rendered
|
| // more than we need. It doesn't seem to result in any noticeable flicker.
|
| - case NotificationType::RENDER_VIEW_HOST_DELETED:
|
| + case chrome::RENDER_VIEW_HOST_DELETED:
|
| deleting_rvh_ = Details<RenderViewHost>(details).ptr();
|
| MaybeUpdateAfterNotification();
|
| break;
|
| - case NotificationType::BACKGROUND_CONTENTS_DELETED:
|
| + case chrome::BACKGROUND_CONTENTS_DELETED:
|
| deleting_rvh_ = Details<BackgroundContents>(details)->render_view_host();
|
| MaybeUpdateAfterNotification();
|
| break;
|
| - case NotificationType::EXTENSION_LOADED:
|
| - case NotificationType::EXTENSION_PROCESS_CREATED:
|
| - case NotificationType::EXTENSION_UNLOADED:
|
| - case NotificationType::EXTENSION_UPDATE_DISABLED:
|
| - case NotificationType::RENDER_VIEW_HOST_CREATED:
|
| - case NotificationType::NAV_ENTRY_COMMITTED:
|
| - case NotificationType::BACKGROUND_CONTENTS_NAVIGATED:
|
| - case NotificationType::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED:
|
| + case chrome::EXTENSION_LOADED:
|
| + case chrome::EXTENSION_PROCESS_CREATED:
|
| + case chrome::EXTENSION_UNLOADED:
|
| + case chrome::EXTENSION_UPDATE_DISABLED:
|
| + case chrome::RENDER_VIEW_HOST_CREATED:
|
| + case chrome::NAV_ENTRY_COMMITTED:
|
| + case chrome::BACKGROUND_CONTENTS_NAVIGATED:
|
| + case chrome::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED:
|
| MaybeUpdateAfterNotification();
|
| break;
|
| default:
|
|
|