main.cc - Issue 5205002: AU: Manual proxy support

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: main.cc

Issue 5205002: AU: Manual proxy support (Closed) Base URL: http://git.chromium.org/git/update_engine.git@master

Patch Set: missed one fix for review Created 10 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: main.cc

diff --git a/main.cc b/main.cc

old mode 100644

new mode 100755

index 0e5d3bc3085d8c02c7674fa76b885b6742b2b244..9dae81ad9aa4069b5003aa7110ff01423f821f95

--- a/main.cc

+++ b/main.cc

@@ -17,6 +17,7 @@

#include <sys/stat.h>

#include "update_engine/dbus_constants.h"

+#include "update_engine/dbus_interface.h"

#include "update_engine/dbus_service.h"

#include "update_engine/prefs.h"

#include "update_engine/subprocess.h"

@@ -180,8 +181,10 @@ int main(int argc, char** argv) {

metrics_lib.Init();

// Create the update attempter:

+ chromeos_update_engine::ConcreteDbusGlib dbus;

chromeos_update_engine::UpdateAttempter update_attempter(&prefs,

- &metrics_lib);

+ &metrics_lib,

+ &dbus);

// Create the dbus service object:

dbus_g_object_type_install_info(UPDATE_ENGINE_TYPE_SERVICE,

« no previous file with comments | « libcurl_http_fetcher.cc ('k') | mock_http_fetcher.h » ('j') | no next file with comments »