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

Side by Side Diff: chrome/common/extensions/extension_unpacker.cc

Issue 5875005: Cleanup: Remove unneeded includes of notification_service.h.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: put includes in right order Created 10 years 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/extension.cc ('k') | chrome/common/net/url_request_intercept_job.cc » ('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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/common/extensions/extension_unpacker.h" 5 #include "chrome/common/extensions/extension_unpacker.h"
6 6
7 #include <set>
8
7 #include "base/file_util.h" 9 #include "base/file_util.h"
8 #include "base/scoped_handle.h" 10 #include "base/scoped_handle.h"
9 #include "base/scoped_temp_dir.h" 11 #include "base/scoped_temp_dir.h"
10 #include "base/string_util.h" 12 #include "base/string_util.h"
11 #include "base/thread.h" 13 #include "base/thread.h"
12 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 15 #include "base/values.h"
14 #include "net/base/file_stream.h" 16 #include "net/base/file_stream.h"
15 #include "chrome/common/common_param_traits.h" 17 #include "chrome/common/common_param_traits.h"
16 #include "chrome/common/extensions/extension.h" 18 #include "chrome/common/extensions/extension.h"
17 #include "chrome/common/extensions/extension_constants.h" 19 #include "chrome/common/extensions/extension_constants.h"
18 #include "chrome/common/extensions/extension_file_util.h" 20 #include "chrome/common/extensions/extension_file_util.h"
19 #include "chrome/common/extensions/extension_l10n_util.h" 21 #include "chrome/common/extensions/extension_l10n_util.h"
20 #include "chrome/common/json_value_serializer.h" 22 #include "chrome/common/json_value_serializer.h"
21 #include "chrome/common/notification_service.h"
22 #include "chrome/common/url_constants.h" 23 #include "chrome/common/url_constants.h"
23 #include "chrome/common/zip.h" 24 #include "chrome/common/zip.h"
24 #include "ipc/ipc_message_utils.h" 25 #include "ipc/ipc_message_utils.h"
25 #include "third_party/skia/include/core/SkBitmap.h" 26 #include "third_party/skia/include/core/SkBitmap.h"
26 #include "webkit/glue/image_decoder.h" 27 #include "webkit/glue/image_decoder.h"
27 28
28 namespace errors = extension_manifest_errors; 29 namespace errors = extension_manifest_errors;
29 namespace keys = extension_manifest_keys; 30 namespace keys = extension_manifest_keys;
30 namespace filenames = extension_filenames; 31 namespace filenames = extension_filenames;
31 32
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 } 144 }
144 145
145 bool ExtensionUnpacker::Run() { 146 bool ExtensionUnpacker::Run() {
146 VLOG(1) << "Installing extension " << extension_path_.value(); 147 VLOG(1) << "Installing extension " << extension_path_.value();
147 148
148 // <profile>/Extensions/INSTALL_TEMP/<version> 149 // <profile>/Extensions/INSTALL_TEMP/<version>
149 temp_install_dir_ = 150 temp_install_dir_ =
150 extension_path_.DirName().AppendASCII(filenames::kTempExtensionName); 151 extension_path_.DirName().AppendASCII(filenames::kTempExtensionName);
151 152
152 if (!file_util::CreateDirectory(temp_install_dir_)) { 153 if (!file_util::CreateDirectory(temp_install_dir_)) {
153
154 #if defined(OS_WIN) 154 #if defined(OS_WIN)
155 std::string dir_string = WideToUTF8(temp_install_dir_.value()); 155 std::string dir_string = WideToUTF8(temp_install_dir_.value());
156 #else 156 #else
157 std::string dir_string = temp_install_dir_.value(); 157 std::string dir_string = temp_install_dir_.value();
158 #endif 158 #endif
159 159
160 SetError(kCouldNotCreateDirectoryError + dir_string); 160 SetError(kCouldNotCreateDirectoryError + dir_string);
161 return false; 161 return false;
162 } 162 }
163 163
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 305
306 parsed_catalogs_->Set(WideToUTF8(relative_path.DirName().ToWStringHack()), 306 parsed_catalogs_->Set(WideToUTF8(relative_path.DirName().ToWStringHack()),
307 root.release()); 307 root.release());
308 308
309 return true; 309 return true;
310 } 310 }
311 311
312 void ExtensionUnpacker::SetError(const std::string &error) { 312 void ExtensionUnpacker::SetError(const std::string &error) {
313 error_message_ = error; 313 error_message_ = error;
314 } 314 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/common/net/url_request_intercept_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698