extensions/shell/browser/shell_browser_main_parts.cc - Issue 803313003: Rename omaha_client and similar tokens to update_client in all contexts.

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: extensions/shell/browser/shell_browser_main_parts.cc

Issue 803313003: Rename omaha_client and similar tokens to update_client in all contexts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr

Patch Set: rebase to master 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « extensions/shell/browser/shell_browser_main_parts.h ('k') | extensions/shell/browser/shell_omaha_query_params_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/shell/browser/shell_browser_main_parts.cc

diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc

index 453474b51bd7a3700bfa4bb92b0358318bf4973d..8b2133a54d0e942e5a419627e2ee19ca7f950e3d 100644

--- a/extensions/shell/browser/shell_browser_main_parts.cc

+++ b/extensions/shell/browser/shell_browser_main_parts.cc

@@ -10,8 +10,8 @@

#include "base/prefs/pref_service.h"

#include "base/run_loop.h"

#include "components/keyed_service/content/browser_context_dependency_manager.h"

-#include "components/omaha_client/omaha_query_params.h"

#include "components/storage_monitor/storage_monitor.h"

+#include "components/update_client/update_query_params.h"

#include "content/public/browser/child_process_security_policy.h"

#include "content/public/browser/context_factory.h"

#include "content/public/browser/devtools_http_handler.h"

@@ -32,8 +32,8 @@

#include "extensions/shell/browser/shell_extension_system_factory.h"

#include "extensions/shell/browser/shell_extensions_browser_client.h"

#include "extensions/shell/browser/shell_oauth2_token_service.h"

-#include "extensions/shell/browser/shell_omaha_query_params_delegate.h"

#include "extensions/shell/browser/shell_prefs.h"

+#include "extensions/shell/browser/shell_update_query_params_delegate.h"

#include "extensions/shell/common/shell_extensions_client.h"

#include "extensions/shell/common/switches.h"

#include "ui/base/ime/input_method_initializer.h"

@@ -167,9 +167,9 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {

browser_context_.get(), user_pref_service_.get()));

ExtensionsBrowserClient::Set(extensions_browser_client_.get());

- omaha_query_params_delegate_.reset(new ShellOmahaQueryParamsDelegate);

- omaha_client::OmahaQueryParams::SetDelegate(

- omaha_query_params_delegate_.get());

+ update_query_params_delegate_.reset(new ShellUpdateQueryParamsDelegate);

+ update_client::UpdateQueryParams::SetDelegate(

+ update_query_params_delegate_.get());

// Create our custom ExtensionSystem first because other

// KeyedServices depend on it.