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

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

Issue 10413011: redo r137692 and r137791 which were speculatively reverted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/js/file_manager.js » ('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 1505 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 SET_STRING(IDS_FILE_BROWSER, SEARCH_EXPAND); 1516 SET_STRING(IDS_FILE_BROWSER, SEARCH_EXPAND);
1517 1517
1518 SET_STRING(IDS_FILE_BROWSER, CHANGE_DEFAULT_MENU_ITEM); 1518 SET_STRING(IDS_FILE_BROWSER, CHANGE_DEFAULT_MENU_ITEM);
1519 SET_STRING(IDS_FILE_BROWSER, CHANGE_DEFAULT_CAPTION); 1519 SET_STRING(IDS_FILE_BROWSER, CHANGE_DEFAULT_CAPTION);
1520 SET_STRING(IDS_FILE_BROWSER, DEFAULT_ACTION_LABEL); 1520 SET_STRING(IDS_FILE_BROWSER, DEFAULT_ACTION_LABEL);
1521 1521
1522 SET_STRING(IDS_FILE_BROWSER, DETAIL_VIEW_TOOLTIP); 1522 SET_STRING(IDS_FILE_BROWSER, DETAIL_VIEW_TOOLTIP);
1523 SET_STRING(IDS_FILE_BROWSER, THUMBNAIL_VIEW_TOOLTIP); 1523 SET_STRING(IDS_FILE_BROWSER, THUMBNAIL_VIEW_TOOLTIP);
1524 #undef SET_STRING 1524 #undef SET_STRING
1525 1525
1526 dict->SetString("PDF_VIEW_ENABLED", 1526 dict->SetBoolean("PDF_VIEW_ENABLED",
1527 file_manager_util::ShouldBeOpenedWithPdfPlugin(profile(), ".pdf") ? 1527 file_manager_util::ShouldBeOpenedWithPdfPlugin(profile(), ".pdf"));
1528 "true" : "false");
1529 1528
1530 ChromeURLDataManager::DataSource::SetFontAndTextDirection(dict); 1529 ChromeURLDataManager::DataSource::SetFontAndTextDirection(dict);
1531 1530
1532 if (gdata::util::IsGDataAvailable(profile())) 1531 dict->SetBoolean("ENABLE_GDATA", gdata::util::IsGDataAvailable(profile()));
1533 dict->SetString("ENABLE_GDATA", "1");
1534 1532
1535 #if defined(USE_ASH) 1533 #if defined(USE_ASH)
1536 dict->SetString("ASH", "1"); 1534 dict->SetBoolean("ASH", true);
1535 #else
1536 dict->SetBoolean("ASH", false);
1537 #endif 1537 #endif
1538 1538
1539 return true; 1539 return true;
1540 } 1540 }
1541 1541
1542 GetGDataFilePropertiesFunction::GetGDataFilePropertiesFunction() { 1542 GetGDataFilePropertiesFunction::GetGDataFilePropertiesFunction() {
1543 } 1543 }
1544 1544
1545 GetGDataFilePropertiesFunction::~GetGDataFilePropertiesFunction() { 1545 GetGDataFilePropertiesFunction::~GetGDataFilePropertiesFunction() {
1546 } 1546 }
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
2121 else if (active_network->type() == chromeos::TYPE_CELLULAR) 2121 else if (active_network->type() == chromeos::TYPE_CELLULAR)
2122 type_string = "cellular"; 2122 type_string = "cellular";
2123 else 2123 else
2124 type_string = "ethernet"; // Currently we do not care about other types. 2124 type_string = "ethernet"; // Currently we do not care about other types.
2125 2125
2126 value->SetString("type", type_string); 2126 value->SetString("type", type_string);
2127 result_.reset(value.release()); 2127 result_.reset(value.release());
2128 2128
2129 return true; 2129 return true;
2130 } 2130 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/file_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698