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

Side by Side Diff: chrome/browser/ui/omnibox/location_bar.cc

Issue 143493005: Allow extensions to remove and override the bookmark shortcut key (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add docs and tests Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/ui/omnibox/location_bar.h" 5 #include "chrome/browser/ui/omnibox/location_bar.h"
6 6
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler. h" 9 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler. h"
10 #include "extensions/browser/extension_system.h" 10 #include "extensions/browser/extension_system.h"
(...skipping 12 matching lines...) Expand all
23 const ExtensionService* extension_service = 23 const ExtensionService* extension_service =
24 extensions::ExtensionSystem::Get(profile_)->extension_service(); 24 extensions::ExtensionSystem::Get(profile_)->extension_service();
25 // Extension service may be NULL during unit test execution. 25 // Extension service may be NULL during unit test execution.
26 if (!extension_service) 26 if (!extension_service)
27 return false; 27 return false;
28 28
29 const extensions::ExtensionSet* extension_set = 29 const extensions::ExtensionSet* extension_set =
30 extension_service->extensions(); 30 extension_service->extensions();
31 for (extensions::ExtensionSet::const_iterator i = extension_set->begin(); 31 for (extensions::ExtensionSet::const_iterator i = extension_set->begin();
32 i != extension_set->end(); ++i) { 32 i != extension_set->end(); ++i) {
33 const extensions::SettingsOverrides* settings_overrides = 33 using extensions::SettingsOverrides;
34 extensions::SettingsOverrides::Get(i->get()); 34 const SettingsOverrides* settings_overrides =
35 if (settings_overrides && settings_overrides->RemovesBookmarkButton() && 35 SettingsOverrides::Get(i->get());
36 if (settings_overrides &&
37 SettingsOverrides::RemovesBookmarkButton(*settings_overrides) &&
36 (extensions::PermissionsData::HasAPIPermission( 38 (extensions::PermissionsData::HasAPIPermission(
37 *i, 39 *i,
38 extensions::APIPermission::kBookmarkManagerPrivate) || 40 extensions::APIPermission::kBookmarkManagerPrivate) ||
39 extensions::FeatureSwitch::enable_override_bookmarks_ui()-> 41 extensions::FeatureSwitch::enable_override_bookmarks_ui()->
40 IsEnabled())) 42 IsEnabled()))
41 return true; 43 return true;
42 } 44 }
43 45
44 return false; 46 return false;
45 } 47 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698