Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(292)

Unified Diff: ui/views/mus/aura_init.cc

Issue 1402213002: Moves mandoline/ui/aura to ui/views/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable presubmit Created 5 years, 2 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 | « ui/views/mus/aura_init.h ('k') | ui/views/mus/input_method_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/aura_init.cc
diff --git a/mandoline/ui/aura/aura_init.cc b/ui/views/mus/aura_init.cc
similarity index 95%
rename from mandoline/ui/aura/aura_init.cc
rename to ui/views/mus/aura_init.cc
index b51dc9ea4ffe2762034ca1cdaee0a267517c5cbd..47aabe576781b253067220a910c50a655b60099a 100644
--- a/mandoline/ui/aura/aura_init.cc
+++ b/ui/views/mus/aura_init.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mandoline/ui/aura/aura_init.h"
+#include "ui/views/mus/aura_init.h"
#include "base/i18n/icu_util.h"
#include "base/lazy_instance.h"
@@ -19,7 +19,7 @@
#include "components/font_service/public/cpp/font_loader.h"
#endif
-namespace mandoline {
+namespace views {
namespace {
@@ -77,7 +77,7 @@ void AuraInit::InitializeResources(mojo::Shell* shell) {
ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
pak_file_2.Pass(), ui::SCALE_FACTOR_100P);
- // Initialize the skia font code to go ask fontconfig underneath.
+// Initialize the skia font code to go ask fontconfig underneath.
#if defined(OS_LINUX) && !defined(OS_ANDROID)
font_loader_ = skia::AdoptRef(new font_service::FontLoader(shell));
SkFontConfigInterface::SetGlobal(font_loader_.get());
@@ -88,4 +88,4 @@ void AuraInit::InitializeResources(mojo::Shell* shell) {
gfx::Font();
}
-} // namespace mandoline
+} // namespace views
« no previous file with comments | « ui/views/mus/aura_init.h ('k') | ui/views/mus/input_method_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698