ui/views/mus/aura_init.cc - Issue 2598963005: Include-what-you-use for WrapUnique/MakeUnique.

Side by Side Diff

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

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

Side by Side Diff: ui/views/mus/aura_init.cc

Issue 2598963005: Include-what-you-use for WrapUnique/MakeUnique. (Closed)

Patch Set: restore order of includes in x11_topmost_window_finder_interactive_uitest.cc Created 3 years, 12 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 unified diff | Download patch

« no previous file with comments | « ui/views/controls/textfield/textfield.cc ('k') | ui/views/mus/drop_target_mus.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ui/views/mus/aura_init.h"	5 #include "ui/views/mus/aura_init.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

9 #include "base/lazy_instance.h"	9 #include "base/lazy_instance.h"

10 #include "base/macros.h"	10 #include "base/macros.h"

	11 #include "base/memory/ptr_util.h"

11 #include "base/path_service.h"	12 #include "base/path_service.h"

12 #include "build/build_config.h"	13 #include "build/build_config.h"

13 #include "services/catalog/public/cpp/resource_loader.h"	14 #include "services/catalog/public/cpp/resource_loader.h"

14 #include "services/catalog/public/interfaces/constants.mojom.h"	15 #include "services/catalog/public/interfaces/constants.mojom.h"

15 #include "services/service_manager/public/cpp/connector.h"	16 #include "services/service_manager/public/cpp/connector.h"

16 #include "ui/aura/env.h"	17 #include "ui/aura/env.h"

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

18 #include "ui/base/material_design/material_design_controller.h"	19 #include "ui/base/material_design/material_design_controller.h"

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

20 #include "ui/base/ui_base_paths.h"	21 #include "ui/base/ui_base_paths.h"

(...skipping 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
112 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(	113 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(

113 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile);	114 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile);

114 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(	115 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(

115 std::move(pak_file_2), ui::SCALE_FACTOR_100P);	116 std::move(pak_file_2), ui::SCALE_FACTOR_100P);

116 if (!resource_file_200_.empty())	117 if (!resource_file_200_.empty())

117 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(	118 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(

118 loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P);	119 loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P);

119 }	120 }

120	121

121 } // namespace views	122 } // namespace views

OLD	NEW