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

Unified Diff: mash/system_ui/system_ui.cc

Issue 1492563002: Introduce mash/shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years 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: mash/system_ui/system_ui.cc
diff --git a/mash/example/mock_sysui/mock_sysui.cc b/mash/system_ui/system_ui.cc
similarity index 91%
rename from mash/example/mock_sysui/mock_sysui.cc
rename to mash/system_ui/system_ui.cc
index 57146b88a210d01542e01b1309ebeaeff86c8d28..117e5a3ee6f4cb9921e3c7f11d26b06b436ef5aa 100644
--- a/mash/example/mock_sysui/mock_sysui.cc
+++ b/mash/system_ui/system_ui.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 "mash/example/mock_sysui/mock_sysui.h"
+#include "mash/system_ui/system_ui.h"
#include "components/mus/public/cpp/property_type_converters.h"
#include "mash/wm/public/interfaces/container.mojom.h"
@@ -14,6 +14,9 @@
#include "ui/views/mus/window_manager_connection.h"
#include "ui/views/widget/widget_delegate.h"
+namespace mash {
+namespace system_ui {
+
namespace {
class DesktopBackground : public views::WidgetDelegateView {
@@ -89,12 +92,12 @@ class Shelf : public views::WidgetDelegateView {
} // namespace
-MockSysUI::MockSysUI() {}
+SystemUI::SystemUI() {}
-MockSysUI::~MockSysUI() {
+SystemUI::~SystemUI() {
}
-void MockSysUI::Initialize(mojo::ApplicationImpl* app) {
+void SystemUI::Initialize(mojo::ApplicationImpl* app) {
tracing_.Initialize(app);
aura_init_.reset(new views::AuraInit(app, "views_mus_resources.pak"));
@@ -104,7 +107,10 @@ void MockSysUI::Initialize(mojo::ApplicationImpl* app) {
Shelf::Create(app->shell());
}
-bool MockSysUI::ConfigureIncomingConnection(
+bool SystemUI::ConfigureIncomingConnection(
mojo::ApplicationConnection* connection) {
- return false;
+ return true;
}
+
+} // namespace system_ui
+} // namespace mash

Powered by Google App Engine
This is Rietveld 408576698