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

Side by Side Diff: update_attempter.h

Issue 6594025: AU: Full proxy support (Closed) Base URL: http://git.chromium.org/git/update_engine.git@master
Patch Set: fixes for review Created 9 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
« no previous file with comments | « mock_dbus_interface.h ('k') | update_attempter.cc » ('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) 2010 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium OS 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 #ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H__ 5 #ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H__
6 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H__ 6 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H__
7 7
8 #include <time.h> 8 #include <time.h>
9 9
10 #include <tr1/memory> 10 #include <tr1/memory>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include <base/time.h> 14 #include <base/time.h>
15 #include <glib.h> 15 #include <glib.h>
16 #include <gtest/gtest_prod.h> // for FRIEND_TEST 16 #include <gtest/gtest_prod.h> // for FRIEND_TEST
17 17
18 #include "update_engine/action_processor.h" 18 #include "update_engine/action_processor.h"
19 #include "update_engine/chrome_proxy_resolver.h" 19 #include "update_engine/chrome_browser_proxy_resolver.h"
20 #include "update_engine/download_action.h" 20 #include "update_engine/download_action.h"
21 #include "update_engine/omaha_request_params.h" 21 #include "update_engine/omaha_request_params.h"
22 #include "update_engine/omaha_response_handler_action.h" 22 #include "update_engine/omaha_response_handler_action.h"
23 #include "update_engine/proxy_resolver.h" 23 #include "update_engine/proxy_resolver.h"
24 24
25 class MetricsLibraryInterface; 25 class MetricsLibraryInterface;
26 struct UpdateEngineService; 26 struct UpdateEngineService;
27 27
28 namespace chromeos_update_engine { 28 namespace chromeos_update_engine {
29 29
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 // Number of consecutive manual update checks we've had where we obeyed 229 // Number of consecutive manual update checks we've had where we obeyed
230 // Chrome's proxy settings. 230 // Chrome's proxy settings.
231 int proxy_manual_checks_; 231 int proxy_manual_checks_;
232 232
233 // If true, this update cycle we are obeying proxies 233 // If true, this update cycle we are obeying proxies
234 bool obeying_proxies_; 234 bool obeying_proxies_;
235 235
236 // Our two proxy resolvers 236 // Our two proxy resolvers
237 DirectProxyResolver direct_proxy_resolver_; 237 DirectProxyResolver direct_proxy_resolver_;
238 ChromeProxyResolver chrome_proxy_resolver_; 238 ChromeBrowserProxyResolver chrome_proxy_resolver_;
239 239
240 DISALLOW_COPY_AND_ASSIGN(UpdateAttempter); 240 DISALLOW_COPY_AND_ASSIGN(UpdateAttempter);
241 }; 241 };
242 242
243 } // namespace chromeos_update_engine 243 } // namespace chromeos_update_engine
244 244
245 #endif // CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H__ 245 #endif // CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H__
OLDNEW
« no previous file with comments | « mock_dbus_interface.h ('k') | update_attempter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698