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

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

Issue 2464663002: chrome: move networking_private_crypto from common to browser (Closed)
Patch Set: chrome/test Created 4 years, 1 month 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
« no previous file with comments | « chrome/test/BUILD.gn ('k') | no next file » | 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 <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 11 matching lines...) Expand all
22 #include "extensions/common/extension_utility_messages.h" 22 #include "extensions/common/extension_utility_messages.h"
23 #include "extensions/utility/unpacker.h" 23 #include "extensions/utility/unpacker.h"
24 #include "media/base/media.h" 24 #include "media/base/media.h"
25 #include "ui/base/ui_base_switches.h" 25 #include "ui/base/ui_base_switches.h"
26 26
27 #if !defined(MEDIA_DISABLE_FFMPEG) 27 #if !defined(MEDIA_DISABLE_FFMPEG)
28 #include "media/base/media_file_checker.h" 28 #include "media/base/media_file_checker.h"
29 #endif 29 #endif
30 30
31 #if defined(OS_WIN) 31 #if defined(OS_WIN)
32 #include "chrome/common/extensions/api/networking_private/networking_private_cry pto.h"
33 #include "chrome/utility/media_galleries/itunes_pref_parser_win.h" 32 #include "chrome/utility/media_galleries/itunes_pref_parser_win.h"
34 #include "components/wifi/wifi_service.h" 33 #include "components/wifi/wifi_service.h"
35 #endif // defined(OS_WIN) 34 #endif // defined(OS_WIN)
36 35
37 #if defined(OS_WIN) || defined(OS_MACOSX) 36 #if defined(OS_WIN) || defined(OS_MACOSX)
38 #include "chrome/utility/media_galleries/iapps_xml_utils.h" 37 #include "chrome/utility/media_galleries/iapps_xml_utils.h"
39 #include "chrome/utility/media_galleries/itunes_library_parser.h" 38 #include "chrome/utility/media_galleries/itunes_library_parser.h"
40 #include "chrome/utility/media_galleries/picasa_album_table_reader.h" 39 #include "chrome/utility/media_galleries/picasa_album_table_reader.h"
41 #include "chrome/utility/media_galleries/picasa_albums_indexer.h" 40 #include "chrome/utility/media_galleries/picasa_albums_indexer.h"
42 #endif // defined(OS_WIN) || defined(OS_MACOSX) 41 #endif // defined(OS_WIN) || defined(OS_MACOSX)
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 199
201 std::string key_data; 200 std::string key_data;
202 std::string error; 201 std::string error;
203 wifi_service->GetKeyFromSystem(network_guid, &key_data, &error); 202 wifi_service->GetKeyFromSystem(network_guid, &key_data, &error);
204 203
205 Send(new ChromeUtilityHostMsg_GotWiFiCredentials(key_data, error.empty())); 204 Send(new ChromeUtilityHostMsg_GotWiFiCredentials(key_data, error.empty()));
206 } 205 }
207 #endif // defined(OS_WIN) 206 #endif // defined(OS_WIN)
208 207
209 } // namespace extensions 208 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/test/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698