chrome/app/chrome_main_delegate.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/app/chrome_main_delegate.cc

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

Patch Set: Avoids a need to use AllowReinitialization 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

Index: chrome/app/chrome_main_delegate.cc

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc

index e4fa69afd1d1bb9270ed1a9bc6beca0c7797c2a7..d3534dfcbbd3b828e9df89193da86ce732a295e2 100644

--- a/chrome/app/chrome_main_delegate.cc

+++ b/chrome/app/chrome_main_delegate.cc

@@ -51,6 +51,7 @@

#include "content/public/common/content_paths.h"

#include "content/public/common/content_switches.h"

#include "extensions/common/constants.h"

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

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

#include "ui/base/ui_base_switches.h"

@@ -792,6 +793,7 @@ void ChromeMainDelegate::PreSandboxStartup() {

base::i18n::SetICUDefaultLocale(locale);

const std::string loaded_locale = locale;

#else

+ ui::MaterialDesignController::Initialize();

const std::string loaded_locale =

ui::ResourceBundle::InitSharedInstanceWithLocale(

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

« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | chrome/app/resources/resources_unittest.cc » ('j') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('J')