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

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

Issue 10830036: Moved the AppNotification system into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest master for cq Created 8 years, 4 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 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 system_(extensions::ExtensionSystem::Get(profile)), 326 system_(extensions::ExtensionSystem::Get(profile)),
327 extension_prefs_(extension_prefs), 327 extension_prefs_(extension_prefs),
328 settings_frontend_(extensions::SettingsFrontend::Create(profile)), 328 settings_frontend_(extensions::SettingsFrontend::Create(profile)),
329 pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)), 329 pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)),
330 install_directory_(install_directory), 330 install_directory_(install_directory),
331 extensions_enabled_(extensions_enabled), 331 extensions_enabled_(extensions_enabled),
332 show_extensions_prompts_(true), 332 show_extensions_prompts_(true),
333 ready_(false), 333 ready_(false),
334 toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), 334 toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
335 menu_manager_(profile), 335 menu_manager_(profile),
336 app_notification_manager_(new AppNotificationManager(profile)), 336 app_notification_manager_(
337 new extensions::AppNotificationManager(profile)),
337 apps_promo_(profile->GetPrefs()), 338 apps_promo_(profile->GetPrefs()),
338 event_routers_initialized_(false), 339 event_routers_initialized_(false),
339 update_once_all_providers_are_ready_(false), 340 update_once_all_providers_are_ready_(false),
340 app_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), 341 app_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
341 extension_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), 342 extension_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
342 extension_warnings_(profile), 343 extension_warnings_(profile),
343 app_shortcut_manager_(profile) { 344 app_shortcut_manager_(profile) {
344 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 345 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
345 346
346 // Figure out if extension installation should be enabled. 347 // Figure out if extension installation should be enabled.
(...skipping 2195 matching lines...) Expand 10 before | Expand all | Expand 10 after
2542 2543
2543 ExtensionService::NaClModuleInfoList::iterator 2544 ExtensionService::NaClModuleInfoList::iterator
2544 ExtensionService::FindNaClModule(const GURL& url) { 2545 ExtensionService::FindNaClModule(const GURL& url) {
2545 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); 2546 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
2546 iter != nacl_module_list_.end(); ++iter) { 2547 iter != nacl_module_list_.end(); ++iter) {
2547 if (iter->url == url) 2548 if (iter->url == url)
2548 return iter; 2549 return iter;
2549 } 2550 }
2550 return nacl_module_list_.end(); 2551 return nacl_module_list_.end();
2551 } 2552 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/sync/glue/app_notification_data_type_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698