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

Unified Diff: mash/wm/frame/caption_buttons/frame_caption_button.h

Issue 1459653002: Gets mustash frames looking like that of ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update test Created 5 years, 1 month 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/wm/frame/caption_buttons/frame_caption_button.h
diff --git a/ash/frame/caption_buttons/frame_caption_button.h b/mash/wm/frame/caption_buttons/frame_caption_button.h
similarity index 82%
copy from ash/frame/caption_buttons/frame_caption_button.h
copy to mash/wm/frame/caption_buttons/frame_caption_button.h
index a54461d4eaad90f742b24c7b8091eee4fc378adb..6708327507f24ea3716406831d619b6d8dd8d20d 100644
--- a/ash/frame/caption_buttons/frame_caption_button.h
+++ b/mash/wm/frame/caption_buttons/frame_caption_button.h
@@ -1,13 +1,13 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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 ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
-#define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
+#ifndef MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
+#define MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
-#include "ash/ash_export.h"
-#include "ash/frame/caption_buttons/caption_button_types.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
+#include "mash/wm/frame/caption_buttons/caption_button_types.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/views/controls/button/custom_button.h"
@@ -15,16 +15,14 @@ namespace gfx {
class SlideAnimation;
}
-namespace ash {
+namespace mash {
+namespace wm {
// Base class for the window caption buttons (minimize, maximize, restore,
// close).
-class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
+class FrameCaptionButton : public views::CustomButton {
public:
- enum Animate {
- ANIMATE_YES,
- ANIMATE_NO
- };
+ enum Animate { ANIMATE_YES, ANIMATE_NO };
static const char kViewClassName[];
@@ -57,9 +55,7 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
paint_as_active_ = paint_as_active;
}
- CaptionButtonIcon icon() const {
- return icon_;
- }
+ CaptionButtonIcon icon() const { return icon_; }
int icon_image_id() const { return icon_image_id_; }
@@ -100,6 +96,7 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton);
};
-} // namespace ash
+} // namespace wm
+} // namespace mash
-#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
+#endif // MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
« no previous file with comments | « mash/wm/frame/caption_buttons/caption_button_types.h ('k') | mash/wm/frame/caption_buttons/frame_caption_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698