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

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

Issue 8493017: Cleanup extension permissions module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month 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
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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 extension_prefs_(extension_prefs), 365 extension_prefs_(extension_prefs),
366 extension_settings_frontend_(profile), 366 extension_settings_frontend_(profile),
367 pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)), 367 pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)),
368 install_directory_(install_directory), 368 install_directory_(install_directory),
369 extensions_enabled_(extensions_enabled), 369 extensions_enabled_(extensions_enabled),
370 show_extensions_prompts_(true), 370 show_extensions_prompts_(true),
371 ready_(false), 371 ready_(false),
372 toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), 372 toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
373 menu_manager_(profile), 373 menu_manager_(profile),
374 app_notification_manager_(new AppNotificationManager(profile)), 374 app_notification_manager_(new AppNotificationManager(profile)),
375 permissions_manager_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
376 apps_promo_(profile->GetPrefs()), 375 apps_promo_(profile->GetPrefs()),
377 event_routers_initialized_(false), 376 event_routers_initialized_(false),
378 extension_warnings_(profile) { 377 extension_warnings_(profile) {
379 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 378 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
380 379
381 // Figure out if extension installation should be enabled. 380 // Figure out if extension installation should be enabled.
382 if (command_line->HasSwitch(switches::kDisableExtensions)) { 381 if (command_line->HasSwitch(switches::kDisableExtensions)) {
383 extensions_enabled_ = false; 382 extensions_enabled_ = false;
384 } else if (profile->GetPrefs()->GetBoolean(prefs::kDisableExtensions)) { 383 } else if (profile->GetPrefs()->GetBoolean(prefs::kDisableExtensions)) {
385 extensions_enabled_ = false; 384 extensions_enabled_ = false;
(...skipping 2094 matching lines...) Expand 10 before | Expand all | Expand 10 after
2480 2479
2481 ExtensionService::NaClModuleInfoList::iterator 2480 ExtensionService::NaClModuleInfoList::iterator
2482 ExtensionService::FindNaClModule(const GURL& url) { 2481 ExtensionService::FindNaClModule(const GURL& url) {
2483 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); 2482 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
2484 iter != nacl_module_list_.end(); ++iter) { 2483 iter != nacl_module_list_.end(); ++iter) {
2485 if (iter->url == url) 2484 if (iter->url == url)
2486 return iter; 2485 return iter;
2487 } 2486 }
2488 return nacl_module_list_.end(); 2487 return nacl_module_list_.end();
2489 } 2488 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698