chrome/service/service_process.cc - Issue 1845343005: Makes MaterialDesignController initialization explicit

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: chrome/service/service_process.cc

Issue 1845343005: Makes MaterialDesignController initialization explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Renamed methods in Linux bits Created 4 years, 8 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

« chrome/browser/ui/startup/bad_flags_prompt.cc ('K') | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc ('k') | content/public/test/browser_test_base.cc » ('j') | content/public/test/browser_test_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/service/service_process.cc

diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc

index f4cf7e5f1a8a4ea9c505d8adeea5afbfe28be32a..8cba1bcae70a55145619d4ae4a7f8af8f62f9368 100644

--- a/chrome/service/service_process.cc

+++ b/chrome/service/service_process.cc

@@ -39,6 +39,7 @@

#include "net/base/network_change_notifier.h"

#include "net/url_request/url_fetcher.h"

#include "ui/base/l10n/l10n_util.h"

+#include "ui/base/material_design/material_design_controller.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_switches.h"

@@ -180,6 +181,7 @@ bool ServiceProcess::Initialize(base::MessageLoopForUI* message_loop,

if (locale.empty())

locale = kDefaultServiceProcessLocale;

}

+ ui::MaterialDesignController::Initialize();

sky 2016/04/11 15:32:40 Why does the service process need material design?

varkha 2016/04/11 19:30:58 InitSharedInstanceWithLocale below (inside Resourc

ui::ResourceBundle::InitSharedInstanceWithLocale(

locale, NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);