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

Unified Diff: athena/activity/activity_frame_view.h

Issue 694413005: athena: Introduce ActivityView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 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
« no previous file with comments | « no previous file | athena/activity/activity_frame_view.cc » ('j') | athena/activity/activity_frame_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/activity/activity_frame_view.h
diff --git a/athena/activity/activity_frame_view.h b/athena/activity/activity_frame_view.h
index f4a59fbf13deabe0ea80299318d52e9628b20e46..f3c50b721d133a6c32f889be1056817109efe19f 100644
--- a/athena/activity/activity_frame_view.h
+++ b/athena/activity/activity_frame_view.h
@@ -5,6 +5,8 @@
#ifndef ATHENA_ACTIVITY_ACTIVITY_FRAME_VIEW_H_
#define ATHENA_ACTIVITY_ACTIVITY_FRAME_VIEW_H_
+#include "athena/activity/public/activity_view.h"
+#include "athena/activity/public/activity_view_model.h"
oshima 2014/11/04 23:42:41 nit: do you need this?
sadrul 2014/11/05 03:36:43 Nope. Removed.
#include "athena/wm/public/window_manager_observer.h"
#include "ui/gfx/insets.h"
#include "ui/views/window/non_client_view.h"
@@ -21,7 +23,8 @@ class ActivityViewModel;
// A NonClientFrameView used for activity.
class ActivityFrameView : public views::NonClientFrameView,
- public WindowManagerObserver {
+ public WindowManagerObserver,
+ public ActivityView {
public:
// The frame class name.
static const char kViewClassName[];
@@ -47,6 +50,11 @@ class ActivityFrameView : public views::NonClientFrameView,
void OnPaintBackground(gfx::Canvas* canvas) override;
private:
+ // ActivityView:
+ void UpdateTitle() override;
+ void UpdateIcon() override;
+ void UpdateRepresentativeColor() override;
+
// WindowManagerObserver:
void OnOverviewModeEnter() override;
void OnOverviewModeExit() override;
« no previous file with comments | « no previous file | athena/activity/activity_frame_view.cc » ('j') | athena/activity/activity_frame_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698