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

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

Issue 10683003: Moved CrxInstaller and CrxInstallerError into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 #include "webkit/fileapi/file_system_context.h" 123 #include "webkit/fileapi/file_system_context.h"
124 #include "webkit/fileapi/file_system_mount_point_provider.h" 124 #include "webkit/fileapi/file_system_mount_point_provider.h"
125 #endif 125 #endif
126 126
127 using base::Time; 127 using base::Time;
128 using content::BrowserContext; 128 using content::BrowserContext;
129 using content::BrowserThread; 129 using content::BrowserThread;
130 using content::DevToolsAgentHost; 130 using content::DevToolsAgentHost;
131 using content::DevToolsAgentHostRegistry; 131 using content::DevToolsAgentHostRegistry;
132 using content::PluginService; 132 using content::PluginService;
133 using extensions::CrxInstaller;
133 using extensions::Extension; 134 using extensions::Extension;
134 using extensions::ExtensionIdSet; 135 using extensions::ExtensionIdSet;
135 using extensions::ExtensionInfo; 136 using extensions::ExtensionInfo;
136 using extensions::UnloadedExtensionInfo; 137 using extensions::UnloadedExtensionInfo;
137 using extensions::PermissionMessage; 138 using extensions::PermissionMessage;
138 using extensions::PermissionMessages; 139 using extensions::PermissionMessages;
139 using extensions::PermissionSet; 140 using extensions::PermissionSet;
140 141
141 namespace errors = extension_manifest_errors; 142 namespace errors = extension_manifest_errors;
142 143
(...skipping 2417 matching lines...) Expand 10 before | Expand all | Expand 10 after
2560 2561
2561 // To coexist with certain unit tests that don't have a work-thread message 2562 // To coexist with certain unit tests that don't have a work-thread message
2562 // loop available at ExtensionService shutdown, we lazy-initialize this 2563 // loop available at ExtensionService shutdown, we lazy-initialize this
2563 // object so that those cases neither create nor destroy an 2564 // object so that those cases neither create nor destroy an
2564 // APIResourceController. 2565 // APIResourceController.
2565 if (!api_resource_controller_.get()) { 2566 if (!api_resource_controller_.get()) {
2566 api_resource_controller_.reset(new extensions::APIResourceController()); 2567 api_resource_controller_.reset(new extensions::APIResourceController());
2567 } 2568 }
2568 return api_resource_controller_.get(); 2569 return api_resource_controller_.get();
2569 } 2570 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698