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

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: Rebase for commit. 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service_unittest.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) 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 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 } else { 401 } else {
402 LOG(WARNING) << "Attempted uninstallation of non-existent extension with " 402 LOG(WARNING) << "Attempted uninstallation of non-existent extension with "
403 << "id: " << extension_id; 403 << "id: " << extension_id;
404 return false; 404 return false;
405 } 405 }
406 406
407 return true; 407 return true;
408 } 408 }
409 409
410 ExtensionService::ExtensionService(Profile* profile, 410 ExtensionService::ExtensionService(Profile* profile,
411 const CommandLine* command_line, 411 const CommandLine* command_line,
412 const FilePath& install_directory, 412 const FilePath& install_directory,
413 ExtensionPrefs* extension_prefs, 413 ExtensionPrefs* extension_prefs,
414 bool autoupdate_enabled) 414 bool autoupdate_enabled)
415 : profile_(profile), 415 : profile_(profile),
416 extension_prefs_(extension_prefs), 416 extension_prefs_(extension_prefs),
417 install_directory_(install_directory), 417 install_directory_(install_directory),
418 extensions_enabled_(true), 418 extensions_enabled_(true),
419 show_extensions_prompts_(true), 419 show_extensions_prompts_(true),
420 ready_(false), 420 ready_(false),
421 ALLOW_THIS_IN_INITIALIZER_LIST(toolbar_model_(this)), 421 ALLOW_THIS_IN_INITIALIZER_LIST(toolbar_model_(this)),
422 default_apps_(profile->GetPrefs(), 422 default_apps_(profile->GetPrefs(),
423 g_browser_process->GetApplicationLocale()), 423 g_browser_process->GetApplicationLocale()),
424 event_routers_initialized_(false) { 424 event_routers_initialized_(false) {
(...skipping 1553 matching lines...) Expand 10 before | Expand all | Expand 10 after
1978 } 1978 }
1979 1979
1980 void ExtensionService::SetBeingUpgraded(const Extension* extension, 1980 void ExtensionService::SetBeingUpgraded(const Extension* extension,
1981 bool value) { 1981 bool value) {
1982 extension_runtime_data_[extension->id()].being_upgraded = value; 1982 extension_runtime_data_[extension->id()].being_upgraded = value;
1983 } 1983 }
1984 1984
1985 PropertyBag* ExtensionService::GetPropertyBag(const Extension* extension) { 1985 PropertyBag* ExtensionService::GetPropertyBag(const Extension* extension) {
1986 return &extension_runtime_data_[extension->id()].property_bag; 1986 return &extension_runtime_data_[extension->id()].property_bag;
1987 } 1987 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698