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

Unified Diff: trunk/src/ui/views/linux_ui/window_button_order_provider.cc

Issue 294473016: Revert 272352 "Reland Linux Window Control Alignment" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/ash/wm/system_gesture_event_filter_unittest.cc ('k') | trunk/src/ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/linux_ui/window_button_order_provider.cc
===================================================================
--- trunk/src/ui/views/linux_ui/window_button_order_provider.cc (revision 272355)
+++ trunk/src/ui/views/linux_ui/window_button_order_provider.cc (working copy)
@@ -1,83 +0,0 @@
-// Copyright 2014 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 "ui/views/window/window_button_order_provider.h"
-
-#include "ui/views/linux_ui/linux_ui.h"
-#include "ui/views/linux_ui/window_button_order_observer.h"
-
-namespace views {
-
-namespace {
-
-class WindowButtonOrderObserverDelegate : public WindowButtonOrderProvider,
- public WindowButtonOrderObserver {
- public:
- WindowButtonOrderObserverDelegate();
- virtual ~WindowButtonOrderObserverDelegate();
-
- // WindowButtonOrderObserver:
- virtual void OnWindowButtonOrderingChange(
- const std::vector<views::FrameButton>& leading_buttons,
- const std::vector<views::FrameButton>& trailing_buttons) OVERRIDE;
- private:
- DISALLOW_COPY_AND_ASSIGN(WindowButtonOrderObserverDelegate);
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// WindowButtonOrderObserverDelegate, public:
-
-WindowButtonOrderObserverDelegate::WindowButtonOrderObserverDelegate() {
- views::LinuxUI* ui = views::LinuxUI::instance();
- if (ui)
- ui->AddWindowButtonOrderObserver(this);
-}
-
-WindowButtonOrderObserverDelegate::~WindowButtonOrderObserverDelegate() {
- views::LinuxUI* ui = views::LinuxUI::instance();
- if (ui)
- ui->RemoveWindowButtonOrderObserver(this);
-}
-
-void WindowButtonOrderObserverDelegate::OnWindowButtonOrderingChange(
- const std::vector<views::FrameButton>& leading_buttons,
- const std::vector<views::FrameButton>& trailing_buttons) {
- SetWindowButtonOrder(leading_buttons, trailing_buttons);
-}
-
-} // namespace
-
-// static
-WindowButtonOrderProvider* WindowButtonOrderProvider::instance_ = NULL;
-
-///////////////////////////////////////////////////////////////////////////////
-// WindowButtonOrderProvider, public:
-
-// static
-WindowButtonOrderProvider* WindowButtonOrderProvider::GetInstance() {
- if (!instance_)
- instance_ = new WindowButtonOrderObserverDelegate;
- return instance_;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// WindowButtonOrderProvider, protected:
-
-WindowButtonOrderProvider::WindowButtonOrderProvider() {
- trailing_buttons_.push_back(views::FRAME_BUTTON_MINIMIZE);
- trailing_buttons_.push_back(views::FRAME_BUTTON_MAXIMIZE);
- trailing_buttons_.push_back(views::FRAME_BUTTON_CLOSE);
-}
-
-WindowButtonOrderProvider::~WindowButtonOrderProvider() {
-}
-
-void WindowButtonOrderProvider::SetWindowButtonOrder(
- const std::vector<views::FrameButton>& leading_buttons,
- const std::vector<views::FrameButton>& trailing_buttons) {
- leading_buttons_ = leading_buttons;
- trailing_buttons_ = trailing_buttons;
-}
-
-} // namespace views
« no previous file with comments | « trunk/src/ash/wm/system_gesture_event_filter_unittest.cc ('k') | trunk/src/ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698