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

Unified Diff: mash/system_ui/system_ui.cc

Issue 1576683002: Add rudimentary mash shelf functionality. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 11 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
Index: mash/system_ui/system_ui.cc
diff --git a/mash/system_ui/system_ui.cc b/mash/system_ui/system_ui.cc
deleted file mode 100644
index 676136537f412fe6d10851d6c834370e3bb6ba1c..0000000000000000000000000000000000000000
--- a/mash/system_ui/system_ui.cc
+++ /dev/null
@@ -1,82 +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.
-
-#include "mash/system_ui/system_ui.h"
-
-#include <stdint.h>
-
-#include "base/macros.h"
-#include "components/mus/public/cpp/property_type_converters.h"
-#include "mash/wm/public/interfaces/container.mojom.h"
-#include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
-#include "ui/gfx/canvas.h"
-#include "ui/views/mus/aura_init.h"
-#include "ui/views/mus/native_widget_mus.h"
-#include "ui/views/mus/window_manager_connection.h"
-#include "ui/views/widget/widget_delegate.h"
-
-namespace mash {
-namespace system_ui {
-namespace {
-
-class Shelf : public views::WidgetDelegateView {
- public:
- static void Create(mojo::Shell* shell) {
- views::Widget* widget = new views::Widget;
- views::Widget::InitParams params(
- views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
- params.delegate = new Shelf;
-
- std::map<std::string, std::vector<uint8_t>> properties;
- properties[mash::wm::mojom::kWindowContainer_Property] =
- mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
- mash::wm::mojom::CONTAINER_USER_SHELF);
- mus::Window* window =
- views::WindowManagerConnection::Get()->NewWindow(properties);
- params.native_widget = new views::NativeWidgetMus(
- widget, shell, window, mus::mojom::SURFACE_TYPE_DEFAULT);
- widget->Init(params);
- widget->Show();
- }
-
- private:
- Shelf() {}
- ~Shelf() override {}
-
- // Overridden from views::View:
- void OnPaint(gfx::Canvas* canvas) override {
- canvas->FillRect(GetLocalBounds(), SK_ColorYELLOW);
- }
- gfx::Size GetPreferredSize() const override { return gfx::Size(1, 48); }
-
- // Overridden from views::WidgetDelegate:
- views::View* GetContentsView() override { return this; }
-
- DISALLOW_COPY_AND_ASSIGN(Shelf);
-};
-
-} // namespace
-
-SystemUI::SystemUI() {}
-
-SystemUI::~SystemUI() {
-}
-
-void SystemUI::Initialize(mojo::ApplicationImpl* app) {
- tracing_.Initialize(app);
-
- aura_init_.reset(new views::AuraInit(app, "views_mus_resources.pak"));
- views::WindowManagerConnection::Create(app);
-
- Shelf::Create(app->shell());
-}
-
-bool SystemUI::ConfigureIncomingConnection(
- mojo::ApplicationConnection* connection) {
- return true;
-}
-
-} // namespace system_ui
-} // namespace mash

Powered by Google App Engine
This is Rietveld 408576698