Commit 85718108 authored by rockot@chromium.org's avatar rockot@chromium.org

Move UpdateManifest to //extensions

This just moves update_manifest.h/cc into the
extensions_common target. Precursor to moving manifest
parsing code and ultimately the rest of the
download/install/update code.

BUG=398671
TBR=dcheng@chromium.org for IPC messages (header move only)

Review URL: https://codereview.chromium.org/454873005

Cr-Commit-Position: refs/heads/master@{#288430}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288430 0039d316-1c4b-4281-b951-d872f2087c98
parent a5eb1794
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#include "chrome/browser/extensions/updater/extension_downloader_delegate.h" #include "chrome/browser/extensions/updater/extension_downloader_delegate.h"
#include "chrome/browser/extensions/updater/manifest_fetch_data.h" #include "chrome/browser/extensions/updater/manifest_fetch_data.h"
#include "chrome/browser/extensions/updater/request_queue.h" #include "chrome/browser/extensions/updater/request_queue.h"
#include "chrome/common/extensions/update_manifest.h"
#include "extensions/common/extension.h" #include "extensions/common/extension.h"
#include "extensions/common/update_manifest.h"
#include "google_apis/gaia/oauth2_token_service.h" #include "google_apis/gaia/oauth2_token_service.h"
#include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_fetcher_delegate.h"
#include "url/gurl.h" #include "url/gurl.h"
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "base/callback.h" #include "base/callback.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/updater/manifest_fetch_data.h" #include "chrome/browser/extensions/updater/manifest_fetch_data.h"
#include "chrome/common/extensions/update_manifest.h"
#include "content/public/browser/utility_process_host_client.h" #include "content/public/browser/utility_process_host_client.h"
#include "extensions/common/update_manifest.h"
namespace extensions { namespace extensions {
......
...@@ -117,8 +117,6 @@ ...@@ -117,8 +117,6 @@
'common/extensions/permissions/chrome_permission_message_provider.h', 'common/extensions/permissions/chrome_permission_message_provider.h',
'common/extensions/sync_helper.cc', 'common/extensions/sync_helper.cc',
'common/extensions/sync_helper.h', 'common/extensions/sync_helper.h',
'common/extensions/update_manifest.cc',
'common/extensions/update_manifest.h',
'common/favicon/favicon_url_parser.cc', 'common/favicon/favicon_url_parser.cc',
'common/favicon/favicon_url_parser.h', 'common/favicon/favicon_url_parser.h',
'common/icon_with_badge_image_source.cc', 'common/icon_with_badge_image_source.cc',
......
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "chrome/common/extensions/update_manifest.h"
#include "chrome/common/media_galleries/iphoto_library.h" #include "chrome/common/media_galleries/iphoto_library.h"
#include "chrome/common/media_galleries/itunes_library.h" #include "chrome/common/media_galleries/itunes_library.h"
#include "chrome/common/media_galleries/metadata_types.h" #include "chrome/common/media_galleries/metadata_types.h"
#include "chrome/common/media_galleries/picasa_types.h" #include "chrome/common/media_galleries/picasa_types.h"
#include "extensions/common/update_manifest.h"
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
#include "ipc/ipc_platform_file.h" #include "ipc/ipc_platform_file.h"
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "base/memory/scoped_vector.h" #include "base/memory/scoped_vector.h"
#include "chrome/common/extensions/update_manifest.h" #include "extensions/common/update_manifest.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "libxml/globals.h" #include "libxml/globals.h"
#include "testing/gtest/include/gtest/gtest.h"
static const char* kValidXml = static const char* kValidXml =
"<?xml version='1.0' encoding='UTF-8'?>" "<?xml version='1.0' encoding='UTF-8'?>"
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include "chrome/common/chrome_utility_messages.h" #include "chrome/common/chrome_utility_messages.h"
#include "chrome/common/extensions/chrome_extensions_client.h" #include "chrome/common/extensions/chrome_extensions_client.h"
#include "chrome/common/extensions/chrome_utility_extensions_messages.h" #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
#include "chrome/common/extensions/update_manifest.h"
#include "chrome/common/media_galleries/metadata_types.h" #include "chrome/common/media_galleries/metadata_types.h"
#include "chrome/utility/chrome_content_utility_client.h" #include "chrome/utility/chrome_content_utility_client.h"
#include "chrome/utility/extensions/unpacker.h" #include "chrome/utility/extensions/unpacker.h"
...@@ -19,6 +18,7 @@ ...@@ -19,6 +18,7 @@
#include "extensions/common/extension.h" #include "extensions/common/extension.h"
#include "extensions/common/extension_l10n_util.h" #include "extensions/common/extension_l10n_util.h"
#include "extensions/common/manifest.h" #include "extensions/common/manifest.h"
#include "extensions/common/update_manifest.h"
#include "media/base/media.h" #include "media/base/media.h"
#include "media/base/media_file_checker.h" #include "media/base/media_file_checker.h"
#include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_switches.h"
......
include_rules = [ include_rules = [
"+device/usb", "+device/usb",
"+grit/extensions_strings.h", "+grit/extensions_strings.h",
"+libxml",
"+net", "+net",
"+third_party/libxml",
"+third_party/re2", "+third_party/re2",
] ]
// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/common/extensions/update_manifest.h" #include "extensions/common/update_manifest.h"
#include <algorithm> #include <algorithm>
......
// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_COMMON_EXTENSIONS_UPDATE_MANIFEST_H_ #ifndef EXTENSIONS_COMMON_UPDATE_MANIFEST_H_
#define CHROME_COMMON_EXTENSIONS_UPDATE_MANIFEST_H_ #define EXTENSIONS_COMMON_UPDATE_MANIFEST_H_
#include <string> #include <string>
#include <vector> #include <vector>
...@@ -92,4 +92,4 @@ class UpdateManifest { ...@@ -92,4 +92,4 @@ class UpdateManifest {
DISALLOW_COPY_AND_ASSIGN(UpdateManifest); DISALLOW_COPY_AND_ASSIGN(UpdateManifest);
}; };
#endif // CHROME_COMMON_EXTENSIONS_UPDATE_MANIFEST_H_ #endif // EXTENSIONS_COMMON_UPDATE_MANIFEST_H_
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
'../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc', '../ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc',
'../url/url.gyp:url_lib', '../url/url.gyp:url_lib',
'../third_party/libxml/libxml.gyp:libxml',
'common/api/api.gyp:extensions_api', 'common/api/api.gyp:extensions_api',
'extensions_strings.gyp:extensions_strings', 'extensions_strings.gyp:extensions_strings',
], ],
...@@ -202,6 +203,8 @@ ...@@ -202,6 +203,8 @@
'common/url_pattern.h', 'common/url_pattern.h',
'common/url_pattern_set.cc', 'common/url_pattern_set.cc',
'common/url_pattern_set.h', 'common/url_pattern_set.h',
'common/update_manifest.cc',
'common/update_manifest.h',
'common/user_script.cc', 'common/user_script.cc',
'common/user_script.h', 'common/user_script.h',
'common/value_counter.cc', 'common/value_counter.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment