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

Unified Diff: chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc

Issue 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
index 9bf3259f975dce0b7ead08b7ad51f078e381c6a5..80198faf5584456b07f0695d299896f6c7225f03 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -90,6 +90,9 @@ GetLoggedInProfileInfoList(content::WebContents* contents) {
profile_info->is_current_profile = true;
// Make an icon URL of the profile.
+#if !defined(USE_ATHENA)
+ // TODO(oshima): Move GetAvatarImageForContext out from ash.
+ // crbug.com/408748.
if (contents) {
const gfx::Image& image =
ash::GetAvatarImageForContext(contents->GetBrowserContext());
@@ -101,6 +104,7 @@ GetLoggedInProfileInfoList(content::WebContents* contents) {
profile_info->profile_image->scale2x_url =
webui::GetBitmapDataUrl(skia.GetRepresentation(2.0f).sk_bitmap());
}
+#endif
result_profiles.push_back(profile_info);
}
@@ -379,6 +383,11 @@ void FileBrowserPrivateRequestWebStoreAccessTokenFunction::OnAccessTokenFetched(
}
bool FileBrowserPrivateGetProfilesFunction::RunSync() {
+#if defined(USE_ATHENA)
+ // TODO(oshima): Figure out what to do.
+ return false;
+#endif
+
const std::vector<linked_ptr<api::file_browser_private::ProfileInfo> >&
profiles = GetLoggedInProfileInfoList(GetAssociatedWebContents());

Powered by Google App Engine
This is Rietveld 408576698