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

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

Issue 11442074: Lazy initialization for ExtensionInputMethodEventRouter (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased Created 8 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
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 <iterator> 8 #include <iterator>
9 #include <set> 9 #include <set>
10 10
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 #include "grit/generated_resources.h" 106 #include "grit/generated_resources.h"
107 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 107 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
108 #include "sync/api/sync_change.h" 108 #include "sync/api/sync_change.h"
109 #include "sync/api/sync_error_factory.h" 109 #include "sync/api/sync_error_factory.h"
110 #include "webkit/database/database_tracker.h" 110 #include "webkit/database/database_tracker.h"
111 #include "webkit/database/database_util.h" 111 #include "webkit/database/database_util.h"
112 112
113 #if defined(OS_CHROMEOS) 113 #if defined(OS_CHROMEOS)
114 #include "chrome/browser/chromeos/cros/cros_library.h" 114 #include "chrome/browser/chromeos/cros/cros_library.h"
115 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h" 115 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
116 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
117 #include "chrome/browser/chromeos/extensions/media_player_event_router.h" 116 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
118 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 117 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
119 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" 118 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
120 #include "content/public/browser/storage_partition.h" 119 #include "content/public/browser/storage_partition.h"
121 #include "webkit/fileapi/file_system_context.h" 120 #include "webkit/fileapi/file_system_context.h"
122 #include "webkit/fileapi/file_system_mount_point_provider.h" 121 #include "webkit/fileapi/file_system_mount_point_provider.h"
123 #endif 122 #endif
124 123
125 using content::BrowserContext; 124 using content::BrowserContext;
126 using content::BrowserThread; 125 using content::BrowserThread;
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 522
524 #if defined(ENABLE_EXTENSIONS) 523 #if defined(ENABLE_EXTENSIONS)
525 browser_event_router_.reset(new extensions::BrowserEventRouter(profile_)); 524 browser_event_router_.reset(new extensions::BrowserEventRouter(profile_));
526 525
527 extensions::PushMessagingAPIFactory::GetForProfile(profile_); 526 extensions::PushMessagingAPIFactory::GetForProfile(profile_);
528 527
529 #if defined(OS_CHROMEOS) 528 #if defined(OS_CHROMEOS)
530 FileBrowserEventRouterFactory::GetForProfile( 529 FileBrowserEventRouterFactory::GetForProfile(
531 profile_)->ObserveFileSystemEvents(); 530 profile_)->ObserveFileSystemEvents();
532 531
533 input_method_event_router_.reset(
534 new chromeos::ExtensionInputMethodEventRouter);
535
536 ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_); 532 ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
537 extensions::InputImeEventRouter::GetInstance()->Init(); 533 extensions::InputImeEventRouter::GetInstance()->Init();
538 #endif // defined(OS_CHROMEOS) 534 #endif // defined(OS_CHROMEOS)
539 #endif // defined(ENABLE_EXTENSIONS) 535 #endif // defined(ENABLE_EXTENSIONS)
540 event_routers_initialized_ = true; 536 event_routers_initialized_ = true;
541 } 537 }
542 538
543 void ExtensionService::Shutdown() { 539 void ExtensionService::Shutdown() {
544 // Do nothing for now. 540 // Do nothing for now.
545 } 541 }
(...skipping 2606 matching lines...) Expand 10 before | Expand all | Expand 10 after
3152 scoped_refptr<const Extension> extension = GetInstalledExtension(*it); 3148 scoped_refptr<const Extension> extension = GetInstalledExtension(*it);
3153 DCHECK(extension); 3149 DCHECK(extension);
3154 if (!extension) 3150 if (!extension)
3155 continue; 3151 continue;
3156 blacklisted_extensions_.Insert(extension); 3152 blacklisted_extensions_.Insert(extension);
3157 UnloadExtension(*it, extension_misc::UNLOAD_REASON_BLACKLIST); 3153 UnloadExtension(*it, extension_misc::UNLOAD_REASON_BLACKLIST);
3158 } 3154 }
3159 3155
3160 IdentifyAlertableExtensions(); 3156 IdentifyAlertableExtensions();
3161 } 3157 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698