| Index: athena/activity/activity_frame_view.h
 | 
| diff --git a/athena/activity/activity_frame_view.h b/athena/activity/activity_frame_view.h
 | 
| deleted file mode 100644
 | 
| index 12d7022c815ff21e00e6ceeb78a5531a4aaa5e5f..0000000000000000000000000000000000000000
 | 
| --- a/athena/activity/activity_frame_view.h
 | 
| +++ /dev/null
 | 
| @@ -1,81 +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.
 | 
| -
 | 
| -#ifndef ATHENA_ACTIVITY_ACTIVITY_FRAME_VIEW_H_
 | 
| -#define ATHENA_ACTIVITY_ACTIVITY_FRAME_VIEW_H_
 | 
| -
 | 
| -#include "athena/activity/public/activity_view.h"
 | 
| -#include "athena/wm/public/window_manager_observer.h"
 | 
| -#include "ui/gfx/geometry/insets.h"
 | 
| -#include "ui/views/window/non_client_view.h"
 | 
| -
 | 
| -namespace views {
 | 
| -class ImageView;
 | 
| -class Label;
 | 
| -class Widget;
 | 
| -}
 | 
| -
 | 
| -namespace athena {
 | 
| -
 | 
| -class ActivityViewModel;
 | 
| -
 | 
| -// A NonClientFrameView used for activity.
 | 
| -class ActivityFrameView : public views::NonClientFrameView,
 | 
| -                          public WindowManagerObserver,
 | 
| -                          public ActivityView {
 | 
| - public:
 | 
| -  // The frame class name.
 | 
| -  static const char kViewClassName[];
 | 
| -
 | 
| -  ActivityFrameView(views::Widget* frame, ActivityViewModel* view_model);
 | 
| -  ~ActivityFrameView() override;
 | 
| -
 | 
| -  // views::NonClientFrameView:
 | 
| -  gfx::Rect GetBoundsForClientView() const override;
 | 
| -  gfx::Rect GetWindowBoundsForClientBounds(
 | 
| -      const gfx::Rect& client_bounds) const override;
 | 
| -  int NonClientHitTest(const gfx::Point& point) override;
 | 
| -  void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
 | 
| -  void ResetWindowControls() override;
 | 
| -  void UpdateWindowIcon() override;
 | 
| -  void UpdateWindowTitle() override;
 | 
| -  void SizeConstraintsChanged() override;
 | 
| -
 | 
| -  // views::View:
 | 
| -  gfx::Size GetPreferredSize() const override;
 | 
| -  const char* GetClassName() const override;
 | 
| -  void Layout() override;
 | 
| -  void OnPaintBackground(gfx::Canvas* canvas) override;
 | 
| -
 | 
| - private:
 | 
| -  // ActivityView:
 | 
| -  void UpdateTitle() override;
 | 
| -  void UpdateIcon() override;
 | 
| -  void UpdateRepresentativeColor() override;
 | 
| -
 | 
| -  // WindowManagerObserver:
 | 
| -  void OnOverviewModeEnter() override;
 | 
| -  void OnOverviewModeExit() override;
 | 
| -  void OnSplitViewModeEnter() override;
 | 
| -  void OnSplitViewModeExit() override;
 | 
| -
 | 
| -  gfx::Insets NonClientBorderInsets() const;
 | 
| -  int NonClientBorderThickness() const;
 | 
| -  int NonClientTopBorderHeight() const;
 | 
| -
 | 
| -  // Not owned.
 | 
| -  views::Widget* frame_;
 | 
| -  ActivityViewModel* view_model_;
 | 
| -  views::Label* title_;
 | 
| -  views::ImageView* icon_;
 | 
| -
 | 
| -  // Whether overview mode is active.
 | 
| -  bool in_overview_;
 | 
| -
 | 
| -  DISALLOW_COPY_AND_ASSIGN(ActivityFrameView);
 | 
| -};
 | 
| -
 | 
| -}  // namespace athena
 | 
| -
 | 
| -#endif  // ATHENA_ACTIVITY_ACTIVITY_FRAME_VIEW_H_
 | 
| 
 |