Commit 1db5a905 authored by Kang Minchul's avatar Kang Minchul Committed by Commit Bot

[linux_ui] Replace DISALLOW_COPY_AND_ASSIGN macros in views/linux_ui

Remove use of base/macro.h and use explicit deletion instead

Bug: 1010217
Change-Id: I506af7085e0098351642a28b127965d16d103c92
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2341022
Commit-Queue: Hyunjune Kim <hyunjune.kim@samsung.com>
Reviewed-by: default avatarAllen Bauer <kylixrd@chromium.org>
Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795784}
parent ec0b91b5
...@@ -694,6 +694,7 @@ Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com> ...@@ -694,6 +694,7 @@ Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com>
Milko Leporis <milko.leporis@imgtec.com> Milko Leporis <milko.leporis@imgtec.com>
Milton Chiang <milton.chiang@mediatek.com> Milton Chiang <milton.chiang@mediatek.com>
Milutin Smiljanic <msmiljanic.gm@gmail.com> Milutin Smiljanic <msmiljanic.gm@gmail.com>
Minchul Kang <tegongkang@gmail.com>
Minggang Wang <minggang.wang@intel.com> Minggang Wang <minggang.wang@intel.com>
Mingmin Xie <melvinxie@gmail.com> Mingmin Xie <melvinxie@gmail.com>
Minjeong Lee <apenr1234@gmail.com> Minjeong Lee <apenr1234@gmail.com>
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <string> #include <string>
#include "base/callback.h" #include "base/callback.h"
#include "base/macros.h"
#include "build/buildflag.h" #include "build/buildflag.h"
#include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColor.h"
#include "ui/base/cursor/cursor_theme_manager.h" #include "ui/base/cursor/cursor_theme_manager.h"
...@@ -78,6 +77,8 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory, ...@@ -78,6 +77,8 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
kRightClick, kRightClick,
}; };
LinuxUI(const LinuxUI&) = delete;
LinuxUI& operator=(const LinuxUI&) = delete;
~LinuxUI() override; ~LinuxUI() override;
// Sets the dynamically loaded singleton that draws the desktop native UI. // Sets the dynamically loaded singleton that draws the desktop native UI.
...@@ -178,9 +179,6 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory, ...@@ -178,9 +179,6 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
protected: protected:
LinuxUI(); LinuxUI();
private:
DISALLOW_COPY_AND_ASSIGN(LinuxUI);
}; };
} // namespace views } // namespace views
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include "ui/views/window/window_button_order_provider.h" #include "ui/views/window/window_button_order_provider.h"
#include "base/macros.h"
#include "ui/views/linux_ui/linux_ui.h" #include "ui/views/linux_ui/linux_ui.h"
#include "ui/views/linux_ui/window_button_order_observer.h" #include "ui/views/linux_ui/window_button_order_observer.h"
...@@ -16,15 +15,17 @@ class WindowButtonOrderObserverDelegate : public WindowButtonOrderProvider, ...@@ -16,15 +15,17 @@ class WindowButtonOrderObserverDelegate : public WindowButtonOrderProvider,
public WindowButtonOrderObserver { public WindowButtonOrderObserver {
public: public:
WindowButtonOrderObserverDelegate(); WindowButtonOrderObserverDelegate();
WindowButtonOrderObserverDelegate(const WindowButtonOrderObserverDelegate&) =
delete;
WindowButtonOrderObserverDelegate& operator=(
const WindowButtonOrderObserverDelegate&) = delete;
~WindowButtonOrderObserverDelegate() override; ~WindowButtonOrderObserverDelegate() override;
// WindowButtonOrderObserver: // WindowButtonOrderObserver:
void OnWindowButtonOrderingChange( void OnWindowButtonOrderingChange(
const std::vector<views::FrameButton>& leading_buttons, const std::vector<views::FrameButton>& leading_buttons,
const std::vector<views::FrameButton>& trailing_buttons) override; const std::vector<views::FrameButton>& trailing_buttons) override;
private:
DISALLOW_COPY_AND_ASSIGN(WindowButtonOrderObserverDelegate);
}; };
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment