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

Side by Side Diff: chrome/browser/google_apis/gdata_util.cc

Issue 10986031: drive: Nullify --enable-drive-v2-api temporarily (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/google_apis/gdata_util.h" 5 #include "chrome/browser/google_apis/gdata_util.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 return true; 83 return true;
84 #else 84 #else
85 // TODO(nhiroki): Check if GData is available or not in a platform 85 // TODO(nhiroki): Check if GData is available or not in a platform
86 // independent way (http://crbug.com/147529). 86 // independent way (http://crbug.com/147529).
87 return false; 87 return false;
88 #endif // OS_CHROMEOS 88 #endif // OS_CHROMEOS
89 } 89 }
90 90
91 bool IsDriveV2ApiEnabled() { 91 bool IsDriveV2ApiEnabled() {
92 static bool enabled = CommandLine::ForCurrentProcess()->HasSwitch( 92 // TODO(kochi): Re-enable this. crbug.com/152230
93 switches::kEnableDriveV2Api); 93 return false;
94 return enabled;
95 } 94 }
96 95
97 base::PlatformFileError DriveFileErrorToPlatformError( 96 base::PlatformFileError DriveFileErrorToPlatformError(
98 gdata::DriveFileError error) { 97 gdata::DriveFileError error) {
99 switch (error) { 98 switch (error) {
100 case gdata::DRIVE_FILE_OK: 99 case gdata::DRIVE_FILE_OK:
101 return base::PLATFORM_FILE_OK; 100 return base::PLATFORM_FILE_OK;
102 101
103 case gdata::DRIVE_FILE_ERROR_FAILED: 102 case gdata::DRIVE_FILE_ERROR_FAILED:
104 return base::PLATFORM_FILE_ERROR_FAILED; 103 return base::PLATFORM_FILE_ERROR_FAILED;
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 const base::Closure& reply_task) { 289 const base::Closure& reply_task) {
291 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 290 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
292 291
293 const bool posted = blocking_task_runner->PostTaskAndReply( 292 const bool posted = blocking_task_runner->PostTaskAndReply(
294 from_here, request_task, reply_task); 293 from_here, request_task, reply_task);
295 DCHECK(posted); 294 DCHECK(posted);
296 } 295 }
297 296
298 } // namespace util 297 } // namespace util
299 } // namespace gdata 298 } // namespace gdata
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698