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

Side by Side Diff: athena/activity/activity_widget_delegate.cc

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 unified diff | Download patch
« no previous file with comments | « athena/activity/activity_widget_delegate.h ('k') | athena/activity/public/activity_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "athena/activity/activity_widget_delegate.h" 5 #include "athena/activity/activity_widget_delegate.h"
6 6
7 #include "athena/activity/activity_frame_view.h" 7 #include "athena/activity/activity_frame_view.h"
8 #include "athena/activity/public/activity_view_model.h" 8 #include "athena/activity/public/activity_view_model.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 #include "ui/views/window/client_view.h" 10 #include "ui/views/window/client_view.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } 43 }
44 44
45 const views::Widget* ActivityWidgetDelegate::GetWidget() const { 45 const views::Widget* ActivityWidgetDelegate::GetWidget() const {
46 return const_cast<ActivityWidgetDelegate*>(this)->GetWidget(); 46 return const_cast<ActivityWidgetDelegate*>(this)->GetWidget();
47 } 47 }
48 48
49 views::View* ActivityWidgetDelegate::GetContentsView() { 49 views::View* ActivityWidgetDelegate::GetContentsView() {
50 return view_model_->GetContentsView(); 50 return view_model_->GetContentsView();
51 } 51 }
52 52
53 views::ClientView* ActivityWidgetDelegate::CreateClientView(
54 views::Widget* widget) {
55 return new views::ClientView(widget, view_model_->GetContentsView());
56 }
57
58 views::NonClientFrameView* ActivityWidgetDelegate::CreateNonClientFrameView( 53 views::NonClientFrameView* ActivityWidgetDelegate::CreateNonClientFrameView(
59 views::Widget* widget) { 54 views::Widget* widget) {
60 return new ActivityFrameView(widget, view_model_); 55 return new ActivityFrameView(widget, view_model_);
61 } 56 }
62 57
63 } // namespace athena 58 } // namespace athena
OLDNEW
« no previous file with comments | « athena/activity/activity_widget_delegate.h ('k') | athena/activity/public/activity_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698