diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 09:12:13 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 09:12:13 +0000 |
| commit | b0af47917b401019c91510ac664be63926a949dc (patch) | |
| tree | ee953b0eb81d49bfea2907060579590290ff2781 /apps | |
| parent | e52484db28caede10e585b75b9b46aff79bcf9a7 (diff) | |
| download | chromium_src-b0af47917b401019c91510ac664be63926a949dc.zip chromium_src-b0af47917b401019c91510ac664be63926a949dc.tar.gz chromium_src-b0af47917b401019c91510ac664be63926a949dc.tar.bz2 | |
Move extension_misc::UnloadedExtensionReason from extension_constants.h to UnloadedExtensionInfo in extension.h.
This precipitated a IWYU fix for extension_constants.h.
BUG=298586,310174
TBR=koz@chromium.org,sky@chromium.org
Review URL: https://codereview.chromium.org/36023002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/DEPS | 1 | ||||
| -rw-r--r-- | apps/app_load_service.cc | 2 | ||||
| -rw-r--r-- | apps/shell_window.cc | 1 |
3 files changed, 3 insertions, 1 deletions
@@ -47,6 +47,7 @@ include_rules = [ "+chrome/common/extensions/api/app_runtime.h", "+chrome/common/extensions/api/app_window.h", "+chrome/common/extensions/extension.h", + "+chrome/common/extensions/extension_constants.h", "+chrome/common/extensions/extension_messages.h", "+chrome/common/extensions/extension_set.h", "+chrome/common/extensions/manifest_handlers/icons_handler.h", diff --git a/apps/app_load_service.cc b/apps/app_load_service.cc index a7aecec..c4e24c3 100644 --- a/apps/app_load_service.cc +++ b/apps/app_load_service.cc @@ -131,7 +131,7 @@ bool AppLoadService::HasShellWindows(const std::string& extension_id) { bool AppLoadService::WasUnloadedForReload( const extensions::UnloadedExtensionInfo& unload_info) { - if (unload_info.reason == extension_misc::UNLOAD_REASON_DISABLE) { + if (unload_info.reason == extensions::UnloadedExtensionInfo::REASON_DISABLE) { ExtensionPrefs* prefs = ExtensionPrefs::Get(profile_); return (prefs->GetDisableReasons(unload_info.extension->id()) & Extension::DISABLE_RELOAD) != 0; diff --git a/apps/shell_window.cc b/apps/shell_window.cc index 9a99743..2b169d0 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -18,6 +18,7 @@ #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" +#include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" |