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

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

Issue 10909230: Fixed new promo banner showing condition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/drive_banners.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 <sys/statvfs.h> 7 #include <sys/statvfs.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 22 matching lines...) Expand all
33 #include "chrome/browser/extensions/extension_tab_util.h" 33 #include "chrome/browser/extensions/extension_tab_util.h"
34 #include "chrome/browser/extensions/process_map.h" 34 #include "chrome/browser/extensions/process_map.h"
35 #include "chrome/browser/google_apis/gdata_util.h" 35 #include "chrome/browser/google_apis/gdata_util.h"
36 #include "chrome/browser/google_apis/gdata_wapi_parser.h" 36 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
37 #include "chrome/browser/google_apis/operation_registry.h" 37 #include "chrome/browser/google_apis/operation_registry.h"
38 #include "chrome/browser/profiles/profile.h" 38 #include "chrome/browser/profiles/profile.h"
39 #include "chrome/browser/ui/browser.h" 39 #include "chrome/browser/ui/browser.h"
40 #include "chrome/browser/ui/browser_window.h" 40 #include "chrome/browser/ui/browser_window.h"
41 #include "chrome/browser/ui/views/select_file_dialog_extension.h" 41 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
42 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 42 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
43 #include "chrome/common/chrome_version_info.h"
44 #include "chrome/common/extensions/extension.h" 43 #include "chrome/common/extensions/extension.h"
45 #include "chrome/common/extensions/extension_constants.h" 44 #include "chrome/common/extensions/extension_constants.h"
46 #include "chrome/common/extensions/extension_icon_set.h" 45 #include "chrome/common/extensions/extension_icon_set.h"
47 #include "chrome/common/extensions/file_browser_handler.h" 46 #include "chrome/common/extensions/file_browser_handler.h"
48 #include "chrome/common/pref_names.h" 47 #include "chrome/common/pref_names.h"
49 #include "chromeos/disks/disk_mount_manager.h" 48 #include "chromeos/disks/disk_mount_manager.h"
50 #include "content/public/browser/child_process_security_policy.h" 49 #include "content/public/browser/child_process_security_policy.h"
51 #include "content/public/browser/render_process_host.h" 50 #include "content/public/browser/render_process_host.h"
52 #include "content/public/browser/render_view_host.h" 51 #include "content/public/browser/render_view_host.h"
53 #include "googleurl/src/gurl.h" 52 #include "googleurl/src/gurl.h"
(...skipping 1828 matching lines...) Expand 10 before | Expand all | Expand 10 after
1882 #endif 1881 #endif
1883 1882
1884 std::string board; 1883 std::string board;
1885 const char kMachineInfoBoard[] = "CHROMEOS_RELEASE_BOARD"; 1884 const char kMachineInfoBoard[] = "CHROMEOS_RELEASE_BOARD";
1886 chromeos::system::StatisticsProvider* provider = 1885 chromeos::system::StatisticsProvider* provider =
1887 chromeos::system::StatisticsProvider::GetInstance(); 1886 chromeos::system::StatisticsProvider::GetInstance();
1888 if (!provider->GetMachineStatistic(kMachineInfoBoard, &board)) 1887 if (!provider->GetMachineStatistic(kMachineInfoBoard, &board))
1889 board = "unknown"; 1888 board = "unknown";
1890 dict->SetString(kMachineInfoBoard, board); 1889 dict->SetString(kMachineInfoBoard, board);
1891 1890
1892 dict->SetString("BROWSER_VERSION_MODIFIER",
1893 chrome::VersionInfo::GetVersionStringModifier());
1894
1895 return true; 1891 return true;
1896 } 1892 }
1897 1893
1898 GetDriveFilePropertiesFunction::GetDriveFilePropertiesFunction() { 1894 GetDriveFilePropertiesFunction::GetDriveFilePropertiesFunction() {
1899 } 1895 }
1900 1896
1901 GetDriveFilePropertiesFunction::~GetDriveFilePropertiesFunction() { 1897 GetDriveFilePropertiesFunction::~GetDriveFilePropertiesFunction() {
1902 } 1898 }
1903 1899
1904 void GetDriveFilePropertiesFunction::DoOperation( 1900 void GetDriveFilePropertiesFunction::DoOperation(
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
2610 gdata::DriveSystemService* system_service = 2606 gdata::DriveSystemService* system_service =
2611 gdata::DriveSystemServiceFactory::GetForProfile(profile_); 2607 gdata::DriveSystemServiceFactory::GetForProfile(profile_);
2612 if (!system_service || !system_service->file_system()) 2608 if (!system_service || !system_service->file_system())
2613 return false; 2609 return false;
2614 2610
2615 FilePath directory_path = GetVirtualPathFromURL(GURL(file_url_as_string)); 2611 FilePath directory_path = GetVirtualPathFromURL(GURL(file_url_as_string));
2616 system_service->file_system()->RequestDirectoryRefresh(directory_path); 2612 system_service->file_system()->RequestDirectoryRefresh(directory_path);
2617 2613
2618 return true; 2614 return true;
2619 } 2615 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/drive_banners.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698