| Index: mash/wm/frame/header_painter.h
|
| diff --git a/ash/frame/header_painter.h b/mash/wm/frame/header_painter.h
|
| similarity index 71%
|
| copy from ash/frame/header_painter.h
|
| copy to mash/wm/frame/header_painter.h
|
| index 47ba3062520e47fd8ab9cef0527ba961a27d7a6a..84eef207f6ea83625d6197a2556660d2edc58f66 100644
|
| --- a/ash/frame/header_painter.h
|
| +++ b/mash/wm/frame/header_painter.h
|
| @@ -1,28 +1,25 @@
|
| -// 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_HEADER_PAINTER_H_
|
| -#define ASH_FRAME_HEADER_PAINTER_H_
|
| -
|
| -#include "ash/ash_export.h"
|
| +#ifndef MASH_WM_FRAME_HEADER_PAINTER_H_
|
| +#define MASH_WM_FRAME_HEADER_PAINTER_H_
|
|
|
| namespace gfx {
|
| class Canvas;
|
| }
|
|
|
| -namespace ash {
|
| +namespace mash {
|
| +namespace wm {
|
|
|
| // Helper class for painting the window header.
|
| -class ASH_EXPORT HeaderPainter {
|
| +// TODO(sky): keep this only if we're going to actually need different
|
| +// subclasses.
|
| +class HeaderPainter {
|
| public:
|
| - enum Mode {
|
| - MODE_ACTIVE,
|
| - MODE_INACTIVE
|
| - };
|
| + enum Mode { MODE_ACTIVE, MODE_INACTIVE };
|
|
|
| - virtual ~HeaderPainter() {
|
| - }
|
| + virtual ~HeaderPainter() {}
|
|
|
| // Returns the header's minimum width.
|
| virtual int GetMinimumHeaderWidth() const = 0;
|
| @@ -49,6 +46,7 @@ class ASH_EXPORT HeaderPainter {
|
| virtual void UpdateLeftViewXInset(int left_view_x_inset) = 0;
|
| };
|
|
|
| -} // namespace ash
|
| +} // namespace wm
|
| +} // namespace mash
|
|
|
| -#endif // ASH_FRAME_HEADER_PAINTER_H_
|
| +#endif // MASH_WM_FRAME_HEADER_PAINTER_H_
|
|
|