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

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

Issue 10829192: Showing the promo on release channel only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 20 matching lines...) Expand all
31 #include "chrome/browser/extensions/extension_function_dispatcher.h" 31 #include "chrome/browser/extensions/extension_function_dispatcher.h"
32 #include "chrome/browser/extensions/extension_process_manager.h" 32 #include "chrome/browser/extensions/extension_process_manager.h"
33 #include "chrome/browser/extensions/extension_service.h" 33 #include "chrome/browser/extensions/extension_service.h"
34 #include "chrome/browser/extensions/extension_tab_util.h" 34 #include "chrome/browser/extensions/extension_tab_util.h"
35 #include "chrome/browser/extensions/process_map.h" 35 #include "chrome/browser/extensions/process_map.h"
36 #include "chrome/browser/profiles/profile.h" 36 #include "chrome/browser/profiles/profile.h"
37 #include "chrome/browser/ui/browser.h" 37 #include "chrome/browser/ui/browser.h"
38 #include "chrome/browser/ui/browser_window.h" 38 #include "chrome/browser/ui/browser_window.h"
39 #include "chrome/browser/ui/views/select_file_dialog_extension.h" 39 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
40 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 40 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
41 #include "chrome/common/chrome_version_info.h"
41 #include "chrome/common/extensions/extension.h" 42 #include "chrome/common/extensions/extension.h"
42 #include "chrome/common/extensions/extension_icon_set.h" 43 #include "chrome/common/extensions/extension_icon_set.h"
43 #include "chrome/common/extensions/file_browser_handler.h" 44 #include "chrome/common/extensions/file_browser_handler.h"
44 #include "chrome/common/pref_names.h" 45 #include "chrome/common/pref_names.h"
45 #include "content/public/browser/child_process_security_policy.h" 46 #include "content/public/browser/child_process_security_policy.h"
46 #include "content/public/browser/render_process_host.h" 47 #include "content/public/browser/render_process_host.h"
47 #include "content/public/browser/render_view_host.h" 48 #include "content/public/browser/render_view_host.h"
48 #include "googleurl/src/gurl.h" 49 #include "googleurl/src/gurl.h"
49 #include "grit/generated_resources.h" 50 #include "grit/generated_resources.h"
50 #include "grit/platform_locale_settings.h" 51 #include "grit/platform_locale_settings.h"
(...skipping 1670 matching lines...) Expand 10 before | Expand all | Expand 10 after
1721 #endif 1722 #endif
1722 1723
1723 std::string board; 1724 std::string board;
1724 const char kMachineInfoBoard[] = "CHROMEOS_RELEASE_BOARD"; 1725 const char kMachineInfoBoard[] = "CHROMEOS_RELEASE_BOARD";
1725 chromeos::system::StatisticsProvider* provider = 1726 chromeos::system::StatisticsProvider* provider =
1726 chromeos::system::StatisticsProvider::GetInstance(); 1727 chromeos::system::StatisticsProvider::GetInstance();
1727 if (!provider->GetMachineStatistic(kMachineInfoBoard, &board)) 1728 if (!provider->GetMachineStatistic(kMachineInfoBoard, &board))
1728 board = "unknown"; 1729 board = "unknown";
1729 dict->SetString(kMachineInfoBoard, board); 1730 dict->SetString(kMachineInfoBoard, board);
1730 1731
1732 dict->SetString("BROWSER_VERSION_MODIFIER",
1733 chrome::VersionInfo::GetVersionStringModifier());
1734
1731 return true; 1735 return true;
1732 } 1736 }
1733 1737
1734 GetGDataFilePropertiesFunction::GetGDataFilePropertiesFunction() { 1738 GetGDataFilePropertiesFunction::GetGDataFilePropertiesFunction() {
1735 } 1739 }
1736 1740
1737 GetGDataFilePropertiesFunction::~GetGDataFilePropertiesFunction() { 1741 GetGDataFilePropertiesFunction::~GetGDataFilePropertiesFunction() {
1738 } 1742 }
1739 1743
1740 void GetGDataFilePropertiesFunction::DoOperation( 1744 void GetGDataFilePropertiesFunction::DoOperation(
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
2426 gdata::GDataSystemService* system_service = 2430 gdata::GDataSystemService* system_service =
2427 gdata::GDataSystemServiceFactory::GetForProfile(profile_); 2431 gdata::GDataSystemServiceFactory::GetForProfile(profile_);
2428 if (!system_service || !system_service->file_system()) 2432 if (!system_service || !system_service->file_system())
2429 return false; 2433 return false;
2430 2434
2431 FilePath directory_path = GetVirtualPathFromURL(GURL(file_url_as_string)); 2435 FilePath directory_path = GetVirtualPathFromURL(GURL(file_url_as_string));
2432 system_service->file_system()->RequestDirectoryRefresh(directory_path); 2436 system_service->file_system()->RequestDirectoryRefresh(directory_path);
2433 2437
2434 return true; 2438 return true;
2435 } 2439 }
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