OLD | NEW |
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 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1066 profile_, extension->GetChromeURLOverrides()); | 1066 profile_, extension->GetChromeURLOverrides()); |
1067 | 1067 |
1068 #if defined(OS_CHROMEOS) | 1068 #if defined(OS_CHROMEOS) |
1069 // Revoke external file access to | 1069 // Revoke external file access to |
1070 if (profile_->GetFileSystemContext() && | 1070 if (profile_->GetFileSystemContext() && |
1071 profile_->GetFileSystemContext()->path_manager() && | 1071 profile_->GetFileSystemContext()->path_manager() && |
1072 profile_->GetFileSystemContext()->path_manager()->external_provider()) { | 1072 profile_->GetFileSystemContext()->path_manager()->external_provider()) { |
1073 profile_->GetFileSystemContext()->path_manager()->external_provider()-> | 1073 profile_->GetFileSystemContext()->path_manager()->external_provider()-> |
1074 RevokeAccessForExtension(extension->id()); | 1074 RevokeAccessForExtension(extension->id()); |
1075 } | 1075 } |
| 1076 |
| 1077 if (extension->input_components().size() > 0) { |
| 1078 ExtensionInputImeEventRouter::GetInstance()->UnregisterAllImes( |
| 1079 profile_, extension->id()); |
| 1080 } |
1076 #endif | 1081 #endif |
1077 | 1082 |
1078 UpdateActiveExtensionsInCrashReporter(); | 1083 UpdateActiveExtensionsInCrashReporter(); |
1079 | 1084 |
1080 bool plugins_changed = false; | 1085 bool plugins_changed = false; |
1081 for (size_t i = 0; i < extension->plugins().size(); ++i) { | 1086 for (size_t i = 0; i < extension->plugins().size(); ++i) { |
1082 const Extension::PluginInfo& plugin = extension->plugins()[i]; | 1087 const Extension::PluginInfo& plugin = extension->plugins()[i]; |
1083 if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 1088 if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
1084 base::Bind(&ForceShutdownPlugin, plugin.path))) | 1089 base::Bind(&ForceShutdownPlugin, plugin.path))) |
1085 NOTREACHED(); | 1090 NOTREACHED(); |
(...skipping 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2517 | 2522 |
2518 ExtensionService::NaClModuleInfoList::iterator | 2523 ExtensionService::NaClModuleInfoList::iterator |
2519 ExtensionService::FindNaClModule(const GURL& url) { | 2524 ExtensionService::FindNaClModule(const GURL& url) { |
2520 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); | 2525 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); |
2521 iter != nacl_module_list_.end(); ++iter) { | 2526 iter != nacl_module_list_.end(); ++iter) { |
2522 if (iter->url == url) | 2527 if (iter->url == url) |
2523 return iter; | 2528 return iter; |
2524 } | 2529 } |
2525 return nacl_module_list_.end(); | 2530 return nacl_module_list_.end(); |
2526 } | 2531 } |
OLD | NEW |