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

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: Created 8 years, 9 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
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 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 SET_STRING(IDS_FILE_BROWSER, WORD_DOCUMENT_FILE_TYPE); 1446 SET_STRING(IDS_FILE_BROWSER, WORD_DOCUMENT_FILE_TYPE);
1447 SET_STRING(IDS_FILE_BROWSER, POWERPOINT_PRESENTATION_FILE_TYPE); 1447 SET_STRING(IDS_FILE_BROWSER, POWERPOINT_PRESENTATION_FILE_TYPE);
1448 SET_STRING(IDS_FILE_BROWSER, EXCEL_FILE_TYPE); 1448 SET_STRING(IDS_FILE_BROWSER, EXCEL_FILE_TYPE);
1449 1449
1450 SET_STRING(IDS_FILE_BROWSER, GDOC_DOCUMENT_FILE_TYPE); 1450 SET_STRING(IDS_FILE_BROWSER, GDOC_DOCUMENT_FILE_TYPE);
1451 SET_STRING(IDS_FILE_BROWSER, GSHEET_DOCUMENT_FILE_TYPE); 1451 SET_STRING(IDS_FILE_BROWSER, GSHEET_DOCUMENT_FILE_TYPE);
1452 SET_STRING(IDS_FILE_BROWSER, GSLIDES_DOCUMENT_FILE_TYPE); 1452 SET_STRING(IDS_FILE_BROWSER, GSLIDES_DOCUMENT_FILE_TYPE);
1453 SET_STRING(IDS_FILE_BROWSER, GDRAW_DOCUMENT_FILE_TYPE); 1453 SET_STRING(IDS_FILE_BROWSER, GDRAW_DOCUMENT_FILE_TYPE);
1454 SET_STRING(IDS_FILE_BROWSER, GTABLE_DOCUMENT_FILE_TYPE); 1454 SET_STRING(IDS_FILE_BROWSER, GTABLE_DOCUMENT_FILE_TYPE);
1455 1455
1456 SET_STRING(IDS_FILE_BROWSER, GDATA_PRODUCT_NAME);
1457 SET_STRING(IDS_FILE_BROWSER, GDATA_LOADING);
1458 SET_STRING(IDS_FILE_BROWSER, GDATA_CANNOT_REACH);
1459 SET_STRING(IDS_FILE_BROWSER, GDATA_RETRY);
1456 1460
1457 SET_STRING(IDS_FILE_BROWSER, AUDIO_PLAYER_TITLE); 1461 SET_STRING(IDS_FILE_BROWSER, AUDIO_PLAYER_TITLE);
1458 #undef SET_STRING 1462 #undef SET_STRING
1459 1463
1464 dict->SetString("GDATA_LEARN_MORE",
1465 l10n_util::GetStringUTF16(IDS_LEARN_MORE));
1466
1460 dict->SetString("PDF_VIEW_ENABLED", 1467 dict->SetString("PDF_VIEW_ENABLED",
1461 file_manager_util::ShouldBeOpenedWithPdfPlugin(".pdf") ? 1468 file_manager_util::ShouldBeOpenedWithPdfPlugin(".pdf") ?
1462 "true" : "false"); 1469 "true" : "false");
1463 1470
1464 ChromeURLDataManager::DataSource::SetFontAndTextDirection(dict); 1471 ChromeURLDataManager::DataSource::SetFontAndTextDirection(dict);
1465 1472
1466 if (!profile_->GetPrefs()->GetBoolean(prefs::kDisableGData)) 1473 if (!profile_->GetPrefs()->GetBoolean(prefs::kDisableGData))
1467 dict->SetString("ENABLE_GDATA", "1"); 1474 dict->SetString("ENABLE_GDATA", "1");
1468 1475
1469 return true; 1476 return true;
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
1907 local_source_file, 1914 local_source_file,
1908 remote_destination_file, 1915 remote_destination_file,
1909 base::Bind(&TransferFileFunction::OnTransferCompleted, 1916 base::Bind(&TransferFileFunction::OnTransferCompleted,
1910 this)); 1917 this));
1911 } 1918 }
1912 1919
1913 void TransferFileFunction::OnTransferCompleted( 1920 void TransferFileFunction::OnTransferCompleted(
1914 base::PlatformFileError error) { 1921 base::PlatformFileError error) {
1915 SendResponse(error == base::PLATFORM_FILE_OK); 1922 SendResponse(error == base::PLATFORM_FILE_OK);
1916 } 1923 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698