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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 4b80b09a4ed5137de9816dbc52eb90f6f42fe538..42e88110fcc482ae0c64698bbe76245d8db6e3f2 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -66,6 +66,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/common/extension_set.h"
#include "extensions/common/feature_switch.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
@@ -1575,10 +1576,10 @@ bool LocationBarView::IsBookmarkStarHiddenByExtension() {
if (!extensions::FeatureSwitch::enable_override_bookmarks_ui()->IsEnabled())
return false;
- const ExtensionSet* extension_set =
+ const extensions::ExtensionSet* extension_set =
extensions::ExtensionSystem::GetForBrowserContext(profile_)
->extension_service()->extensions();
- for (ExtensionSet::const_iterator i = extension_set->begin();
+ for (extensions::ExtensionSet::const_iterator i = extension_set->begin();
i != extension_set->end(); ++i) {
const extensions::SettingsOverrides* settings_overrides =
extensions::SettingsOverrides::Get(i->get());
« no previous file with comments | « chrome/browser/ui/sync/profile_signin_confirmation_helper.cc ('k') | chrome/browser/ui/webui/cookies_tree_model_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698