| Index: chrome/browser/ui/webui/options/extension_settings_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.h b/chrome/browser/ui/webui/options/extension_settings_handler.h
|
| index a4c51b11682ab1d0eb85870072aba7a383949e25..2fbf7c3bbb4f66c1250cfa241bcbe7c185225acd 100644
|
| --- a/chrome/browser/ui/webui/options/extension_settings_handler.h
|
| +++ b/chrome/browser/ui/webui/options/extension_settings_handler.h
|
| @@ -155,7 +155,7 @@ class ExtensionSettingsHandler : public OptionsPageUIHandler,
|
| std::vector<ExtensionPage> GetActivePagesForExtension(
|
| const Extension* extension);
|
| void GetActivePagesForExtensionProcess(
|
| - const std::set<RenderViewHost*>& views,
|
| + const std::set<content::RenderViewHost*>& views,
|
| std::vector<ExtensionPage> *result);
|
|
|
| // Returns the ExtensionUninstallDialog object for this class, creating it if
|
| @@ -184,7 +184,7 @@ class ExtensionSettingsHandler : public OptionsPageUIHandler,
|
| // notification is sent when it is in the process of being deleted (and before
|
| // it is removed from the process). Keep a pointer to it so we can exclude
|
| // it from the active views.
|
| - RenderViewHost* deleting_rvh_;
|
| + content::RenderViewHost* deleting_rvh_;
|
|
|
| // We want to register for notifications only after we've responded at least
|
| // once to the page, otherwise we'd be calling javacsript functions on objects
|
|
|