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

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: 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 094e5ffc174fec991befa5ded82050686f424e69..aaec50ed38a00e2fbd43a307e6eac79ec817902e 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);
}
@@ -384,6 +388,12 @@ bool FileBrowserPrivateGetProfilesFunction::RunSync() {
// Obtains the display profile ID.
apps::AppWindow* const app_window = GetCurrentAppWindow(this);
+
+#if defined(USE_ATHENA)
+ // TODO(oshima): Figure out what to do.
+ return false;
+#endif
+
chrome::MultiUserWindowManager* const window_manager =
chrome::MultiUserWindowManager::GetInstance();
const std::string current_profile_id =

Powered by Google App Engine
This is Rietveld 408576698