Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(696)

Side by Side Diff: chrome/utility/extensions/extensions_handler.cc

Issue 454873005: Move UpdateManifest to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/extensions/update_manifest_unittest.cc ('k') | extensions/common/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/utility/extensions/extensions_handler.h" 5 #include "chrome/utility/extensions/extensions_handler.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "chrome/common/chrome_utility_messages.h" 9 #include "chrome/common/chrome_utility_messages.h"
10 #include "chrome/common/extensions/chrome_extensions_client.h" 10 #include "chrome/common/extensions/chrome_extensions_client.h"
11 #include "chrome/common/extensions/chrome_utility_extensions_messages.h" 11 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
12 #include "chrome/common/extensions/update_manifest.h"
13 #include "chrome/common/media_galleries/metadata_types.h" 12 #include "chrome/common/media_galleries/metadata_types.h"
14 #include "chrome/utility/chrome_content_utility_client.h" 13 #include "chrome/utility/chrome_content_utility_client.h"
15 #include "chrome/utility/extensions/unpacker.h" 14 #include "chrome/utility/extensions/unpacker.h"
16 #include "chrome/utility/media_galleries/image_metadata_extractor.h" 15 #include "chrome/utility/media_galleries/image_metadata_extractor.h"
17 #include "content/public/common/content_paths.h" 16 #include "content/public/common/content_paths.h"
18 #include "content/public/utility/utility_thread.h" 17 #include "content/public/utility/utility_thread.h"
19 #include "extensions/common/extension.h" 18 #include "extensions/common/extension.h"
20 #include "extensions/common/extension_l10n_util.h" 19 #include "extensions/common/extension_l10n_util.h"
21 #include "extensions/common/manifest.h" 20 #include "extensions/common/manifest.h"
21 #include "extensions/common/update_manifest.h"
22 #include "media/base/media.h" 22 #include "media/base/media.h"
23 #include "media/base/media_file_checker.h" 23 #include "media/base/media_file_checker.h"
24 #include "ui/base/ui_base_switches.h" 24 #include "ui/base/ui_base_switches.h"
25 25
26 #if defined(OS_WIN) 26 #if defined(OS_WIN)
27 #include "chrome/common/extensions/api/networking_private/networking_private_cry pto.h" 27 #include "chrome/common/extensions/api/networking_private/networking_private_cry pto.h"
28 #include "chrome/utility/media_galleries/itunes_pref_parser_win.h" 28 #include "chrome/utility/media_galleries/itunes_pref_parser_win.h"
29 #include "components/wifi/wifi_service.h" 29 #include "components/wifi/wifi_service.h"
30 #endif // defined(OS_WIN) 30 #endif // defined(OS_WIN)
31 31
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 NetworkingPrivateCrypto crypto; 281 NetworkingPrivateCrypto crypto;
282 success = crypto.EncryptByteString(public_key, key_data, &ciphertext); 282 success = crypto.EncryptByteString(public_key, key_data, &ciphertext);
283 } 283 }
284 284
285 Send(new ChromeUtilityHostMsg_GotEncryptedWiFiCredentials(ciphertext, 285 Send(new ChromeUtilityHostMsg_GotEncryptedWiFiCredentials(ciphertext,
286 success)); 286 success));
287 } 287 }
288 #endif // defined(OS_WIN) 288 #endif // defined(OS_WIN)
289 289
290 } // namespace extensions 290 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/update_manifest_unittest.cc ('k') | extensions/common/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698