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

Side by Side Diff: chrome/browser/plugins/plugins_resource_service.cc

Issue 833323002: Remove --plugins-metadata-server-url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved build error in mac Created 5 years, 11 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
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('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/plugins/plugins_resource_service.h" 5 #include "chrome/browser/plugins/plugins_resource_service.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/plugins/plugin_finder.h" 10 #include "chrome/browser/plugins/plugin_finder.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 #include "url/gurl.h" 13 #include "url/gurl.h"
14 14
15 namespace { 15 namespace {
16 16
17 // Delay on first fetch so we don't interfere with startup. 17 // Delay on first fetch so we don't interfere with startup.
18 const int kStartResourceFetchDelayMs = 60 * 1000; 18 const int kStartResourceFetchDelayMs = 60 * 1000;
19 19
20 // Delay between calls to update the cache 1 day and 2 minutes in testing mode. 20 // Delay between calls to update the cache 1 day and 2 minutes in testing mode.
21 const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000; 21 const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
22 const int kTestCacheUpdateDelayMs = 2 * 60 * 1000;
23 22
24 const char kPluginsServerUrl[] = 23 const char kPluginsServerUrl[] =
25 "https://www.gstatic.com/chrome/config/plugins_2/"; 24 "https://www.gstatic.com/chrome/config/plugins_2/";
26 25
27 bool IsTest() {
28 return base::CommandLine::ForCurrentProcess()->HasSwitch(
29 switches::kPluginsMetadataServerURL);
30 }
31
32 GURL GetPluginsServerURL() { 26 GURL GetPluginsServerURL() {
33 std::string filename; 27 std::string filename;
34 #if defined(OS_WIN) 28 #if defined(OS_WIN)
35 filename = "plugins_win.json"; 29 filename = "plugins_win.json";
36 #elif defined(OS_LINUX) 30 #elif defined(OS_LINUX)
37 filename = "plugins_linux.json"; 31 filename = "plugins_linux.json";
38 #elif defined(OS_MACOSX) 32 #elif defined(OS_MACOSX)
39 filename = "plugins_mac.json"; 33 filename = "plugins_mac.json";
40 #else 34 #else
41 #error Unknown platform 35 #error Unknown platform
42 #endif 36 #endif
43 37
44 std::string test_url = 38 return GURL(kPluginsServerUrl + filename);
45 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
46 switches::kPluginsMetadataServerURL);
47 return GURL(IsTest() ? test_url : kPluginsServerUrl + filename);
48 }
49
50 int GetCacheUpdateDelay() {
51 return IsTest() ? kTestCacheUpdateDelayMs : kCacheUpdateDelayMs;
52 } 39 }
53 40
54 } // namespace 41 } // namespace
55 42
56 PluginsResourceService::PluginsResourceService(PrefService* local_state) 43 PluginsResourceService::PluginsResourceService(PrefService* local_state)
57 : WebResourceService(local_state, 44 : WebResourceService(local_state,
58 GetPluginsServerURL(), 45 GetPluginsServerURL(),
59 false, 46 false,
60 prefs::kPluginsResourceCacheUpdate, 47 prefs::kPluginsResourceCacheUpdate,
61 kStartResourceFetchDelayMs, 48 kStartResourceFetchDelayMs,
62 GetCacheUpdateDelay()) { 49 kCacheUpdateDelayMs) {
63 } 50 }
64 51
65 void PluginsResourceService::Init() { 52 void PluginsResourceService::Init() {
66 const base::DictionaryValue* metadata = 53 const base::DictionaryValue* metadata =
67 prefs_->GetDictionary(prefs::kPluginsMetadata); 54 prefs_->GetDictionary(prefs::kPluginsMetadata);
68 PluginFinder::GetInstance()->ReinitializePlugins(metadata); 55 PluginFinder::GetInstance()->ReinitializePlugins(metadata);
69 StartAfterDelay(); 56 StartAfterDelay();
70 } 57 }
71 58
72 PluginsResourceService::~PluginsResourceService() { 59 PluginsResourceService::~PluginsResourceService() {
73 } 60 }
74 61
75 // static 62 // static
76 void PluginsResourceService::RegisterPrefs(PrefRegistrySimple* registry) { 63 void PluginsResourceService::RegisterPrefs(PrefRegistrySimple* registry) {
77 registry->RegisterDictionaryPref(prefs::kPluginsMetadata, 64 registry->RegisterDictionaryPref(prefs::kPluginsMetadata,
78 new base::DictionaryValue()); 65 new base::DictionaryValue());
79 registry->RegisterStringPref(prefs::kPluginsResourceCacheUpdate, "0"); 66 registry->RegisterStringPref(prefs::kPluginsResourceCacheUpdate, "0");
80 } 67 }
81 68
82 void PluginsResourceService::Unpack(const base::DictionaryValue& parsed_json) { 69 void PluginsResourceService::Unpack(const base::DictionaryValue& parsed_json) {
83 prefs_->Set(prefs::kPluginsMetadata, parsed_json); 70 prefs_->Set(prefs::kPluginsMetadata, parsed_json);
84 PluginFinder::GetInstance()->ReinitializePlugins(&parsed_json); 71 PluginFinder::GetInstance()->ReinitializePlugins(&parsed_json);
85 } 72 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698