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

Unified Diff: chrome/browser/extensions/unpacked_installer.cc

Issue 15987009: Update chrome/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/script_executor.cc ('k') | chrome/browser/extensions/user_script_listener.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/unpacked_installer.cc
diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc
index 6faa7f18de558a095faa7b273612ea54988bebe5..20ec22849ca9d0700072f4370e90281b015559ba 100644
--- a/chrome/browser/extensions/unpacked_installer.cc
+++ b/chrome/browser/extensions/unpacked_installer.cc
@@ -118,7 +118,7 @@ bool UnpackedInstaller::LoadFromCommandLine(const base::FilePath& path_in,
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(extension_path_.empty());
- if (!service_weak_)
+ if (!service_weak_.get())
return false;
// Load extensions from the command line synchronously to avoid a race
// between extension loading and loading an URL from the command line.
@@ -151,7 +151,7 @@ bool UnpackedInstaller::LoadFromCommandLine(const base::FilePath& path_in,
void UnpackedInstaller::ShowInstallPrompt() {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (!service_weak_)
+ if (!service_weak_.get())
return;
const ExtensionSet* disabled_extensions =
@@ -205,7 +205,7 @@ int UnpackedInstaller::GetFlags() {
}
bool UnpackedInstaller::IsLoadingUnpackedAllowed() const {
- if (!service_weak_)
+ if (!service_weak_.get())
return true;
// If there is a "*" in the extension blacklist, then no extensions should be
// allowed at all (except explicitly whitelisted extensions).
@@ -225,7 +225,7 @@ void UnpackedInstaller::GetAbsolutePath() {
void UnpackedInstaller::CheckExtensionFileAccess() {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (!service_weak_)
+ if (!service_weak_.get())
return;
if (!IsLoadingUnpackedAllowed()) {
@@ -265,7 +265,7 @@ void UnpackedInstaller::LoadWithFileAccess(int flags) {
void UnpackedInstaller::ReportExtensionLoadError(const std::string &error) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (!service_weak_)
+ if (!service_weak_.get())
return;
service_weak_->ReportExtensionLoadError(extension_path_, error, true);
}
« no previous file with comments | « chrome/browser/extensions/script_executor.cc ('k') | chrome/browser/extensions/user_script_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698