| Index: chrome/renderer/extensions/extension_process_bindings.cc
|
| ===================================================================
|
| --- chrome/renderer/extensions/extension_process_bindings.cc (revision 33268)
|
| +++ chrome/renderer/extensions/extension_process_bindings.cc (working copy)
|
| @@ -9,11 +9,8 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/command_line.h"
|
| #include "base/json/json_reader.h"
|
| #include "base/singleton.h"
|
| -#include "chrome/common/child_process_logging.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_message_bundle.h"
|
| #include "chrome/common/extensions/url_pattern.h"
|
| @@ -105,19 +102,6 @@
|
| }
|
| }
|
|
|
| -static std::vector<std::string> GetActiveExtensionIDs() {
|
| - std::vector<std::string> extension_ids;
|
| - ExtensionPermissionsMap& permissions =
|
| - Singleton<SingletonData>()->permissions_;
|
| -
|
| - for (ExtensionPermissionsMap::iterator iter = permissions.begin();
|
| - iter != permissions.end(); ++iter) {
|
| - extension_ids.push_back(iter->first);
|
| - }
|
| -
|
| - return extension_ids;
|
| -}
|
| -
|
| // A RenderViewVisitor class that iterates through the set of available
|
| // views, looking for a view of the given type, in the given browser window
|
| // and within the given extension.
|
| @@ -642,12 +626,6 @@
|
| permissions_map[Extension::kPermissionNames[i]] = false;
|
| for (size_t i = 0; i < permissions.size(); ++i)
|
| permissions_map[permissions[i]] = true;
|
| -
|
| - // Ugly hack. We also update our list of active extensions here. This always
|
| - // gets called, even if the extension has no api permissions. In single
|
| - // process, this has already been done in the browser code.
|
| - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
|
| - child_process_logging::SetActiveExtensions(GetActiveExtensionIDs());
|
| }
|
|
|
| // static
|
|
|