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

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

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 2 Created 8 years, 7 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 #if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD) 125 #if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
126 #include "chrome/browser/extensions/extension_input_ui_api.h" 126 #include "chrome/browser/extensions/extension_input_ui_api.h"
127 #endif 127 #endif
128 128
129 using base::Time; 129 using base::Time;
130 using content::BrowserContext; 130 using content::BrowserContext;
131 using content::BrowserThread; 131 using content::BrowserThread;
132 using content::DevToolsAgentHost; 132 using content::DevToolsAgentHost;
133 using content::DevToolsAgentHostRegistry; 133 using content::DevToolsAgentHostRegistry;
134 using content::PluginService; 134 using content::PluginService;
135 using extensions::Extension;
136 using extensions::ExtensionIdSet;
137 using extensions::ExtensionInfo;
138 using extensions::UnloadedExtensionInfo;
135 139
136 namespace errors = extension_manifest_errors; 140 namespace errors = extension_manifest_errors;
137 141
138 namespace { 142 namespace {
139 143
140 #if defined(OS_LINUX) 144 #if defined(OS_LINUX)
141 static const int kOmniboxIconPaddingLeft = 2; 145 static const int kOmniboxIconPaddingLeft = 2;
142 static const int kOmniboxIconPaddingRight = 2; 146 static const int kOmniboxIconPaddingRight = 2;
143 #elif defined(OS_MACOSX) 147 #elif defined(OS_MACOSX)
144 static const int kOmniboxIconPaddingLeft = 0; 148 static const int kOmniboxIconPaddingLeft = 0;
(...skipping 2498 matching lines...) Expand 10 before | Expand all | Expand 10 after
2643 // To coexist with certain unit tests that don't have an IO thread message 2647 // To coexist with certain unit tests that don't have an IO thread message
2644 // loop available at ExtensionService shutdown, we lazy-initialize this 2648 // loop available at ExtensionService shutdown, we lazy-initialize this
2645 // object so that those cases neither create nor destroy an 2649 // object so that those cases neither create nor destroy an
2646 // APIResourceController. 2650 // APIResourceController.
2647 CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2651 CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2648 if (!api_resource_controller_) { 2652 if (!api_resource_controller_) {
2649 api_resource_controller_ = new extensions::APIResourceController(); 2653 api_resource_controller_ = new extensions::APIResourceController();
2650 } 2654 }
2651 return api_resource_controller_; 2655 return api_resource_controller_;
2652 } 2656 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698