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

Side by Side Diff: chrome/browser/extensions/zipfile_installer.cc

Issue 1092963004: [chrome/browser/extensions] favor DCHECK_CURRENTLY_ON for better logs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « chrome/browser/extensions/webstore_installer.cc ('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/browser/extensions/zipfile_installer.h" 5 #include "chrome/browser/extensions/zipfile_installer.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "chrome/browser/extensions/extension_error_reporter.h" 9 #include "chrome/browser/extensions/extension_error_reporter.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 16 matching lines...) Expand all
27 } // namespace 27 } // namespace
28 28
29 namespace extensions { 29 namespace extensions {
30 30
31 ZipFileInstaller::ZipFileInstaller(ExtensionService* extension_service) 31 ZipFileInstaller::ZipFileInstaller(ExtensionService* extension_service)
32 : be_noisy_on_failure_(true), 32 : be_noisy_on_failure_(true),
33 extension_service_weak_(extension_service->AsWeakPtr()) { 33 extension_service_weak_(extension_service->AsWeakPtr()) {
34 } 34 }
35 35
36 void ZipFileInstaller::LoadFromZipFile(const base::FilePath& path) { 36 void ZipFileInstaller::LoadFromZipFile(const base::FilePath& path) {
37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 37 DCHECK_CURRENTLY_ON(BrowserThread::UI);
38 zip_path_ = path; 38 zip_path_ = path;
39 BrowserThread::PostTask(BrowserThread::FILE, 39 BrowserThread::PostTask(BrowserThread::FILE,
40 FROM_HERE, 40 FROM_HERE,
41 base::Bind(&ZipFileInstaller::PrepareTempDir, this)); 41 base::Bind(&ZipFileInstaller::PrepareTempDir, this));
42 } 42 }
43 43
44 void ZipFileInstaller::PrepareTempDir() { 44 void ZipFileInstaller::PrepareTempDir() {
45 CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 45 CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
46 base::FilePath temp_dir; 46 base::FilePath temp_dir;
47 PathService::Get(base::DIR_TEMP, &temp_dir); 47 PathService::Get(base::DIR_TEMP, &temp_dir);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 if (extension_service_weak_.get()) { 94 if (extension_service_weak_.get()) {
95 ExtensionErrorReporter::GetInstance()->ReportLoadError( 95 ExtensionErrorReporter::GetInstance()->ReportLoadError(
96 zip_path_, 96 zip_path_,
97 error, 97 error,
98 extension_service_weak_->profile(), 98 extension_service_weak_->profile(),
99 be_noisy_on_failure_); 99 be_noisy_on_failure_);
100 } 100 }
101 } 101 }
102 102
103 void ZipFileInstaller::OnUnzipSucceeded(const base::FilePath& unzipped_path) { 103 void ZipFileInstaller::OnUnzipSucceeded(const base::FilePath& unzipped_path) {
104 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 104 DCHECK_CURRENTLY_ON(BrowserThread::IO);
105 BrowserThread::PostTask( 105 BrowserThread::PostTask(
106 BrowserThread::UI, 106 BrowserThread::UI,
107 FROM_HERE, 107 FROM_HERE,
108 base::Bind( 108 base::Bind(
109 &ZipFileInstaller::ReportSuccessOnUIThread, this, unzipped_path)); 109 &ZipFileInstaller::ReportSuccessOnUIThread, this, unzipped_path));
110 } 110 }
111 111
112 void ZipFileInstaller::OnUnzipFailed(const std::string& error) { 112 void ZipFileInstaller::OnUnzipFailed(const std::string& error) {
113 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 113 DCHECK_CURRENTLY_ON(BrowserThread::IO);
114 BrowserThread::PostTask( 114 BrowserThread::PostTask(
115 BrowserThread::UI, 115 BrowserThread::UI,
116 FROM_HERE, 116 FROM_HERE,
117 base::Bind(&ZipFileInstaller::ReportErrorOnUIThread, this, error)); 117 base::Bind(&ZipFileInstaller::ReportErrorOnUIThread, this, error));
118 } 118 }
119 119
120 bool ZipFileInstaller::OnMessageReceived(const IPC::Message& message) { 120 bool ZipFileInstaller::OnMessageReceived(const IPC::Message& message) {
121 bool handled = true; 121 bool handled = true;
122 IPC_BEGIN_MESSAGE_MAP(ZipFileInstaller, message) 122 IPC_BEGIN_MESSAGE_MAP(ZipFileInstaller, message)
123 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnzipToDir_Succeeded, 123 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnzipToDir_Succeeded,
124 OnUnzipSucceeded) 124 OnUnzipSucceeded)
125 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnzipToDir_Failed, OnUnzipFailed) 125 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnzipToDir_Failed, OnUnzipFailed)
126 IPC_MESSAGE_UNHANDLED(handled = false) 126 IPC_MESSAGE_UNHANDLED(handled = false)
127 IPC_END_MESSAGE_MAP() 127 IPC_END_MESSAGE_MAP()
128 return handled; 128 return handled;
129 } 129 }
130 130
131 } // namespace extensions 131 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/webstore_installer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698