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

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

Issue 8761018: Start the IME Daemon when adding an extension IME (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pre-submit Created 9 years 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 | « chrome/browser/extensions/extension_input_ime_api.cc ('k') | no next file » | 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 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 profile_, extension->GetChromeURLOverrides()); 1053 profile_, extension->GetChromeURLOverrides());
1054 1054
1055 #if defined(OS_CHROMEOS) 1055 #if defined(OS_CHROMEOS)
1056 // Revoke external file access to 1056 // Revoke external file access to
1057 if (profile_->GetFileSystemContext() && 1057 if (profile_->GetFileSystemContext() &&
1058 profile_->GetFileSystemContext()->path_manager() && 1058 profile_->GetFileSystemContext()->path_manager() &&
1059 profile_->GetFileSystemContext()->path_manager()->external_provider()) { 1059 profile_->GetFileSystemContext()->path_manager()->external_provider()) {
1060 profile_->GetFileSystemContext()->path_manager()->external_provider()-> 1060 profile_->GetFileSystemContext()->path_manager()->external_provider()->
1061 RevokeAccessForExtension(extension->id()); 1061 RevokeAccessForExtension(extension->id());
1062 } 1062 }
1063
1064 if (extension->input_components().size() > 0) {
1065 ExtensionInputImeEventRouter::GetInstance()->UnregisterAllImes(
1066 profile_, extension->id());
1067 }
1063 #endif 1068 #endif
1064 1069
1065 UpdateActiveExtensionsInCrashReporter(); 1070 UpdateActiveExtensionsInCrashReporter();
1066 1071
1067 bool plugins_changed = false; 1072 bool plugins_changed = false;
1068 for (size_t i = 0; i < extension->plugins().size(); ++i) { 1073 for (size_t i = 0; i < extension->plugins().size(); ++i) {
1069 const Extension::PluginInfo& plugin = extension->plugins()[i]; 1074 const Extension::PluginInfo& plugin = extension->plugins()[i];
1070 if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, 1075 if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
1071 base::Bind(&ForceShutdownPlugin, plugin.path))) 1076 base::Bind(&ForceShutdownPlugin, plugin.path)))
1072 NOTREACHED(); 1077 NOTREACHED();
(...skipping 1427 matching lines...) Expand 10 before | Expand all | Expand 10 after
2500 2505
2501 ExtensionService::NaClModuleInfoList::iterator 2506 ExtensionService::NaClModuleInfoList::iterator
2502 ExtensionService::FindNaClModule(const GURL& url) { 2507 ExtensionService::FindNaClModule(const GURL& url) {
2503 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); 2508 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
2504 iter != nacl_module_list_.end(); ++iter) { 2509 iter != nacl_module_list_.end(); ++iter) {
2505 if (iter->url == url) 2510 if (iter->url == url)
2506 return iter; 2511 return iter;
2507 } 2512 }
2508 return nacl_module_list_.end(); 2513 return nacl_module_list_.end();
2509 } 2514 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_input_ime_api.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698