chrome/browser/chrome_browser_main.cc - Issue 2692663002: Gut ash::MaterialDesignController, and remove the about:flags entry.

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/browser/chrome_browser_main.cc

Issue 2692663002: Gut ash::MaterialDesignController, and remove the about:flags entry. (Closed)

Patch Set: yet another rebase Created 3 years, 10 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:

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index 0341b8284d70b859b5532cd7abb2958b6f4a4ed1..828945097ff5f5465cc636cfdeb2d39190b83a41 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -186,7 +186,6 @@

#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)

#if defined(OS_CHROMEOS)

-#include "ash/common/material_design/material_design_controller.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/settings/cros_settings_names.h"

@@ -1050,9 +1049,6 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {

// are not available until this point. Now that they are, proceed with

// initializing the MaterialDesignController.

ui::MaterialDesignController::Initialize();

-#if defined(OS_CHROMEOS)

- ash::MaterialDesignController::Initialize();

-#endif // !defined(OS_CHROMEOS)

#if defined(OS_WIN)

// This is needed to enable ETW exporting when requested in about:flags.

« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/test/base/browser_with_test_window_test.cc » ('j') | no next file with comments »