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

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

Issue 560913006: Changing the Weakptr initialization order in chrome/browser/extension folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/user_script_loader.h ('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/user_script_loader.h" 5 #include "chrome/browser/extensions/user_script_loader.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 345
346 UserScriptLoader::UserScriptLoader(Profile* profile, 346 UserScriptLoader::UserScriptLoader(Profile* profile,
347 const ExtensionId& owner_extension_id, 347 const ExtensionId& owner_extension_id,
348 bool listen_for_extension_system_loaded) 348 bool listen_for_extension_system_loaded)
349 : user_scripts_(new UserScriptList()), 349 : user_scripts_(new UserScriptList()),
350 clear_scripts_(false), 350 clear_scripts_(false),
351 extension_system_ready_(false), 351 extension_system_ready_(false),
352 pending_load_(false), 352 pending_load_(false),
353 profile_(profile), 353 profile_(profile),
354 owner_extension_id_(owner_extension_id), 354 owner_extension_id_(owner_extension_id),
355 weak_factory_(this), 355 extension_registry_observer_(this),
356 extension_registry_observer_(this) { 356 weak_factory_(this) {
357 extension_registry_observer_.Add(ExtensionRegistry::Get(profile)); 357 extension_registry_observer_.Add(ExtensionRegistry::Get(profile));
358 if (listen_for_extension_system_loaded) { 358 if (listen_for_extension_system_loaded) {
359 ExtensionSystem::Get(profile_)->ready().Post( 359 ExtensionSystem::Get(profile_)->ready().Post(
360 FROM_HERE, 360 FROM_HERE,
361 base::Bind(&UserScriptLoader::OnExtensionSystemReady, 361 base::Bind(&UserScriptLoader::OnExtensionSystemReady,
362 weak_factory_.GetWeakPtr())); 362 weak_factory_.GetWeakPtr()));
363 } else { 363 } else {
364 extension_system_ready_ = true; 364 extension_system_ready_ = true;
365 } 365 }
366 registrar_.Add(this, 366 registrar_.Add(this,
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 // which leads to the above lookup failing. In this case, just continue. 595 // which leads to the above lookup failing. In this case, just continue.
596 if (!extension) 596 if (!extension)
597 continue; 597 continue;
598 extensions_info_[*it] = ExtensionSet::ExtensionPathAndDefaultLocale( 598 extensions_info_[*it] = ExtensionSet::ExtensionPathAndDefaultLocale(
599 extension->path(), LocaleInfo::GetDefaultLocale(extension)); 599 extension->path(), LocaleInfo::GetDefaultLocale(extension));
600 } 600 }
601 } 601 }
602 } 602 }
603 603
604 } // namespace extensions 604 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/user_script_loader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698