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

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

Issue 6293006: Allow relative paths to external extension files for some providers, error out for others. (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Tested registry install on windows. Created 9 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 } else { 400 } else {
401 LOG(WARNING) << "Attempted uninstallation of non-existent extension with " 401 LOG(WARNING) << "Attempted uninstallation of non-existent extension with "
402 << "id: " << extension_id; 402 << "id: " << extension_id;
403 return false; 403 return false;
404 } 404 }
405 405
406 return true; 406 return true;
407 } 407 }
408 408
409 ExtensionService::ExtensionService(Profile* profile, 409 ExtensionService::ExtensionService(Profile* profile,
410 const CommandLine* command_line, 410 const CommandLine* command_line,
411 const FilePath& install_directory, 411 const FilePath& install_directory,
412 ExtensionPrefs* extension_prefs, 412 ExtensionPrefs* extension_prefs,
413 bool autoupdate_enabled) 413 bool autoupdate_enabled)
414 : profile_(profile), 414 : profile_(profile),
415 extension_prefs_(extension_prefs), 415 extension_prefs_(extension_prefs),
416 install_directory_(install_directory), 416 install_directory_(install_directory),
417 extensions_enabled_(true), 417 extensions_enabled_(true),
418 show_extensions_prompts_(true), 418 show_extensions_prompts_(true),
419 ready_(false), 419 ready_(false),
420 ALLOW_THIS_IN_INITIALIZER_LIST(toolbar_model_(this)), 420 ALLOW_THIS_IN_INITIALIZER_LIST(toolbar_model_(this)),
421 default_apps_(profile->GetPrefs(), 421 default_apps_(profile->GetPrefs(),
422 g_browser_process->GetApplicationLocale()), 422 g_browser_process->GetApplicationLocale()),
423 event_routers_initialized_(false) { 423 event_routers_initialized_(false) {
(...skipping 1551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1975 } 1975 }
1976 1976
1977 void ExtensionService::SetBeingUpgraded(const Extension* extension, 1977 void ExtensionService::SetBeingUpgraded(const Extension* extension,
1978 bool value) { 1978 bool value) {
1979 extension_runtime_data_[extension->id()].being_upgraded = value; 1979 extension_runtime_data_[extension->id()].being_upgraded = value;
1980 } 1980 }
1981 1981
1982 PropertyBag* ExtensionService::GetPropertyBag(const Extension* extension) { 1982 PropertyBag* ExtensionService::GetPropertyBag(const Extension* extension) {
1983 return &extension_runtime_data_[extension->id()].property_bag; 1983 return &extension_runtime_data_[extension->id()].property_bag;
1984 } 1984 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698