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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sessions/session_service_factory.cc

Issue 855503002: Remove remainder of USE_ATHENA ifdefs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_USE_ATHENA3
Patch Set: Created 5 years, 11 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
« chrome/browser/renderer_host/pepper/pepper_talk_host.cc ('K') | « chrome/browser/sessions/session_data_deleter.cc ('k') | chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/session_service_factory.cc
diff --git a/chrome/browser/sessions/session_service_factory.cc b/chrome/browser/sessions/session_service_factory.cc
index 9fdef7b52792267aff5792721900a4ed0c4aafe8..99a7e8b7f40ea0a03d993b045405b50515078663 100644
--- a/chrome/browser/sessions/session_service_factory.cc
+++ b/chrome/browser/sessions/session_service_factory.cc
@@ -11,8 +11,8 @@
// static
SessionService* SessionServiceFactory::GetForProfile(Profile* profile) {
-#if defined(OS_ANDROID) || defined(USE_ATHENA)
- // For Android and Athena we do not store sessions in the SessionService.
+#if defined(OS_ANDROID)
+ // For Android we do not store sessions in the SessionService.
return NULL;
#else
return static_cast<SessionService*>(
@@ -23,8 +23,8 @@ SessionService* SessionServiceFactory::GetForProfile(Profile* profile) {
// static
SessionService* SessionServiceFactory::GetForProfileIfExisting(
Profile* profile) {
-#if defined(OS_ANDROID) || defined(USE_ATHENA)
- // For Android and Athena we do not store sessions in the SessionService.
+#if defined(OS_ANDROID)
+ // For Android we do not store sessions in the SessionService.
return NULL;
#else
return static_cast<SessionService*>(
« chrome/browser/renderer_host/pepper/pepper_talk_host.cc ('K') | « chrome/browser/sessions/session_data_deleter.cc ('k') | chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698