Chromium Code Reviews| Index: chrome/browser/extensions/extension_host.h |
| =================================================================== |
| --- chrome/browser/extensions/extension_host.h (revision 138369) |
| +++ chrome/browser/extensions/extension_host.h (working copy) |
| @@ -18,7 +18,7 @@ |
| #include "content/public/browser/notification_registrar.h" |
| #include "content/public/browser/web_contents_delegate.h" |
| #include "content/public/browser/web_contents_observer.h" |
| -#include "content/public/common/view_type.h" |
| +#include "chrome/common/view_type.h" |
|
Avi (use Gerrit)
2012/05/23 04:40:35
alphabetize
jam
2012/05/23 05:08:16
Done.
|
| #if defined(TOOLKIT_VIEWS) |
| #include "chrome/browser/ui/views/extensions/extension_view.h" |
| @@ -68,7 +68,7 @@ |
| ExtensionHost(const extensions::Extension* extension, |
| content::SiteInstance* site_instance, |
| - const GURL& url, content::ViewType host_type); |
| + const GURL& url, chrome::ViewType host_type); |
| virtual ~ExtensionHost(); |
| #if defined(TOOLKIT_VIEWS) |
| @@ -107,7 +107,7 @@ |
| Profile* profile() const { return profile_; } |
| - content::ViewType extension_host_type() const { return extension_host_type_; } |
| + chrome::ViewType extension_host_type() const { return extension_host_type_; } |
| const GURL& GetURL() const; |
| // ExtensionFunctionDispatcher::Delegate |
| @@ -243,7 +243,7 @@ |
| ExtensionFunctionDispatcher extension_function_dispatcher_; |
| // The type of view being hosted. |
| - content::ViewType extension_host_type_; |
| + chrome::ViewType extension_host_type_; |
| // The relevant WebContents associated with this ExtensionHost, if any. |
| content::WebContents* associated_web_contents_; |