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

Unified Diff: mandoline/ui/aura/aura_init.h

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 | « mandoline/ui/aura/DEPS ('k') | mandoline/ui/aura/aura_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/aura/aura_init.h
diff --git a/mandoline/ui/aura/aura_init.h b/mandoline/ui/aura/aura_init.h
deleted file mode 100644
index 029f8adec2af27dc31183f15202a9a81caff2c94..0000000000000000000000000000000000000000
--- a/mandoline/ui/aura/aura_init.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MANDOLINE_UI_AURA_AURA_INIT_H_
-#define MANDOLINE_UI_AURA_AURA_INIT_H_
-
-#include <string>
-
-#include "skia/ext/refptr.h"
-#include "ui/mojo/init/ui_init.h"
-
-namespace font_service {
-class FontLoader;
-}
-
-namespace mojo {
-class Shell;
-}
-
-namespace mus {
-class View;
-}
-
-namespace mandoline {
-
-// Sets up necessary state for aura when run with the viewmanager.
-// TODO(sky): move this out of mandoline.
-// |resource_file| is the path to the apk file containing the resources.
-class AuraInit {
- public:
- AuraInit(mus::View* root,
- mojo::Shell* shell,
- const std::string& resource_file);
- ~AuraInit();
-
- private:
- void InitializeResources(mojo::Shell* shell);
-
- ui::mojo::UIInit ui_init_;
-
-#if defined(OS_LINUX) && !defined(OS_ANDROID)
- skia::RefPtr<font_service::FontLoader> font_loader_;
-#endif
-
- const std::string resource_file_;
-
- DISALLOW_COPY_AND_ASSIGN(AuraInit);
-};
-
-} // namespace mandoline
-
-#endif // MANDOLINE_UI_AURA_AURA_INIT_H_
« no previous file with comments | « mandoline/ui/aura/DEPS ('k') | mandoline/ui/aura/aura_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698