| OLD | NEW |
| 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 Loading... |
| 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 |
| OLD | NEW |