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

Unified Diff: chrome/browser/ui/app_list/search/people/people_result.cc

Issue 1329033002: Disable extension Panels on Dev and Canary, except for the whitelist (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove stray Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/panels/panel_manager.cc » ('j') | chrome/browser/ui/panels/panel_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/search/people/people_result.cc
diff --git a/chrome/browser/ui/app_list/search/people/people_result.cc b/chrome/browser/ui/app_list/search/people/people_result.cc
index ab748320549aa4c76bbf2a37a20b855843ec7ea0..dd3ffd247d9d1dd3939e5bf7c679bb2ccccbfec5 100644
--- a/chrome/browser/ui/app_list/search/people/people_result.cc
+++ b/chrome/browser/ui/app_list/search/people/people_result.cc
@@ -37,15 +37,6 @@ namespace {
const char kImageSizePath[] = "s64-p/";
const char kEmailUrlPrefix[] = "mailto:";
-const char* const kHangoutsExtensionIds[] = {
- "nckgahadagoaajjgafhacjanaoiihapd",
- "ljclpkphhpbpinifbeabbhlfddcpfdde",
- "ppleadejekpmccmnpjdimmlfljlkdfej",
- "eggnbpckecmjlblplehfpjjdhhidfdoj",
- "jfjjdfefebklmdbmenmlehlopoocnoeh",
- "knipolnnllmklapflnccelgolnpehhpl"
-};
-
// Add a query parameter to specify the size to fetch the image in. The
// original profile image can be of an arbitrary size, we ask the server to
// crop it to a square 64x64 using its smart cropping algorithm.
@@ -188,12 +179,10 @@ void PeopleResult::SendEmail() {
}
void PeopleResult::RefreshHangoutsExtensionId() {
- // TODO(rkc): Change this once we remove the hangoutsPrivate API.
- // See crbug.com/306672
tapted 2015/09/07 05:30:27 This has been closed WontFix, so I don't think thi
- for (size_t i = 0; i < arraysize(kHangoutsExtensionIds); ++i) {
- if (extensions::EventRouter::Get(profile_)->ExtensionHasEventListener(
- kHangoutsExtensionIds[i], OnHangoutRequested::kEventName)) {
- hangouts_extension_id_ = kHangoutsExtensionIds[i];
+ for (const char* id : extension_misc::kHangoutsExtensionIds) {
+ if (extensions::EventRouter::Get(profile_)
+ ->ExtensionHasEventListener(id, OnHangoutRequested::kEventName)) {
+ hangouts_extension_id_ = id;
return;
}
}
« no previous file with comments | « no previous file | chrome/browser/ui/panels/panel_manager.cc » ('j') | chrome/browser/ui/panels/panel_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698