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

Unified Diff: chrome/browser/google_apis/gdata_util.cc

Issue 10920091: Move Drive API files to google_apis directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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
Index: chrome/browser/google_apis/gdata_util.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_util.cc b/chrome/browser/google_apis/gdata_util.cc
similarity index 97%
rename from chrome/browser/chromeos/gdata/gdata_util.cc
rename to chrome/browser/google_apis/gdata_util.cc
index e63510ffad2b2abdb2358af2f4d1f69c7d64774d..e7875b4d7224527f5763a8d8875ebc391431cc44 100644
--- a/chrome/browser/chromeos/gdata/gdata_util.cc
+++ b/chrome/browser/google_apis/gdata_util.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/gdata/gdata_util.h"
+#include "chrome/browser/google_apis/gdata_util.h"
#include <string>
#include <vector>
@@ -65,6 +65,7 @@ bool ParseTimezone(const base::StringPiece& timezone,
} // namespace
bool IsGDataAvailable(Profile* profile) {
satorux1 2012/09/07 17:22:32 Seems to me that this is IsDriveAvailable() rather
nhiroki 2012/09/10 07:17:38 Renaming is not urgent. I will do in another CL.
+#if defined(OS_CHROMEOS)
if (!chromeos::UserManager::Get()->IsUserLoggedIn() ||
chromeos::UserManager::Get()->IsLoggedInAsGuest() ||
chromeos::UserManager::Get()->IsLoggedInAsDemoUser())
@@ -81,6 +82,11 @@ bool IsGDataAvailable(Profile* profile) {
return false;
return true;
+#else
+ // TODO(nhiroki): Check if GData is available or not in a platform independent
+ // way.
satorux1 2012/09/07 17:22:32 Please file a bug and add a URL to it. s/GData/Dri
nhiroki 2012/09/10 07:17:38 Ditto.
+ return false;
+#endif
}
satorux1 2012/09/07 17:22:32 This patch is huge. I'd suggest to make changes li
nhiroki 2012/09/10 07:17:38 I made a separate patch to wrap with OS_CHROMEOS m
bool IsDriveV2ApiEnabled() {

Powered by Google App Engine
This is Rietveld 408576698