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

Side by Side Diff: chrome/browser/chromeos/extensions/file_browser_private_api.cc

Issue 9855024: Postpone connecting to GData even more, provide progress indication. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, addressed comments Created 8 years, 8 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 | chrome/browser/resources/file_manager/css/file_manager.css » ('j') | 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/chromeos/extensions/file_browser_private_api.h" 5 #include "chrome/browser/chromeos/extensions/file_browser_private_api.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1441 matching lines...) Expand 10 before | Expand all | Expand 10 after
1452 SET_STRING(IDS_FILE_BROWSER, WORD_DOCUMENT_FILE_TYPE); 1452 SET_STRING(IDS_FILE_BROWSER, WORD_DOCUMENT_FILE_TYPE);
1453 SET_STRING(IDS_FILE_BROWSER, POWERPOINT_PRESENTATION_FILE_TYPE); 1453 SET_STRING(IDS_FILE_BROWSER, POWERPOINT_PRESENTATION_FILE_TYPE);
1454 SET_STRING(IDS_FILE_BROWSER, EXCEL_FILE_TYPE); 1454 SET_STRING(IDS_FILE_BROWSER, EXCEL_FILE_TYPE);
1455 1455
1456 SET_STRING(IDS_FILE_BROWSER, GDOC_DOCUMENT_FILE_TYPE); 1456 SET_STRING(IDS_FILE_BROWSER, GDOC_DOCUMENT_FILE_TYPE);
1457 SET_STRING(IDS_FILE_BROWSER, GSHEET_DOCUMENT_FILE_TYPE); 1457 SET_STRING(IDS_FILE_BROWSER, GSHEET_DOCUMENT_FILE_TYPE);
1458 SET_STRING(IDS_FILE_BROWSER, GSLIDES_DOCUMENT_FILE_TYPE); 1458 SET_STRING(IDS_FILE_BROWSER, GSLIDES_DOCUMENT_FILE_TYPE);
1459 SET_STRING(IDS_FILE_BROWSER, GDRAW_DOCUMENT_FILE_TYPE); 1459 SET_STRING(IDS_FILE_BROWSER, GDRAW_DOCUMENT_FILE_TYPE);
1460 SET_STRING(IDS_FILE_BROWSER, GTABLE_DOCUMENT_FILE_TYPE); 1460 SET_STRING(IDS_FILE_BROWSER, GTABLE_DOCUMENT_FILE_TYPE);
1461 1461
1462 SET_STRING(IDS_FILE_BROWSER, GDATA_PRODUCT_NAME);
1463 SET_STRING(IDS_FILE_BROWSER, GDATA_LOADING);
1464 SET_STRING(IDS_FILE_BROWSER, GDATA_CANNOT_REACH);
1465 SET_STRING(IDS_FILE_BROWSER, GDATA_RETRY);
1462 1466
1463 SET_STRING(IDS_FILE_BROWSER, AUDIO_PLAYER_TITLE); 1467 SET_STRING(IDS_FILE_BROWSER, AUDIO_PLAYER_TITLE);
1464 #undef SET_STRING 1468 #undef SET_STRING
1465 1469
1470 dict->SetString("GDATA_LEARN_MORE",
1471 l10n_util::GetStringUTF16(IDS_LEARN_MORE));
1472
1466 dict->SetString("PDF_VIEW_ENABLED", 1473 dict->SetString("PDF_VIEW_ENABLED",
1467 file_manager_util::ShouldBeOpenedWithPdfPlugin(".pdf") ? 1474 file_manager_util::ShouldBeOpenedWithPdfPlugin(".pdf") ?
1468 "true" : "false"); 1475 "true" : "false");
1469 1476
1470 ChromeURLDataManager::DataSource::SetFontAndTextDirection(dict); 1477 ChromeURLDataManager::DataSource::SetFontAndTextDirection(dict);
1471 1478
1472 if (!profile_->GetPrefs()->GetBoolean(prefs::kDisableGData)) 1479 if (!profile_->GetPrefs()->GetBoolean(prefs::kDisableGData))
1473 dict->SetString("ENABLE_GDATA", "1"); 1480 dict->SetString("ENABLE_GDATA", "1");
1474 1481
1475 return true; 1482 return true;
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
1918 void TransferFileFunction::OnTransferCompleted( 1925 void TransferFileFunction::OnTransferCompleted(
1919 base::PlatformFileError error) { 1926 base::PlatformFileError error) {
1920 if (error == base::PLATFORM_FILE_OK) { 1927 if (error == base::PLATFORM_FILE_OK) {
1921 SendResponse(true); 1928 SendResponse(true);
1922 } else { 1929 } else {
1923 error_ = base::StringPrintf("%d", static_cast<int>( 1930 error_ = base::StringPrintf("%d", static_cast<int>(
1924 webkit_glue::PlatformFileErrorToWebFileError(error))); 1931 webkit_glue::PlatformFileErrorToWebFileError(error)));
1925 SendResponse(false); 1932 SendResponse(false);
1926 } 1933 }
1927 } 1934 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/css/file_manager.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698