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

Side by Side Diff: ash/system/tray/tray_empty.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 11 months 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/tray_details_view.cc ('k') | ash/system/tray/tray_popup_label_button.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/system/tray/tray_empty.h" 5 #include "ash/system/tray/tray_empty.h"
6 6
7 #include "ui/views/layout/box_layout.h" 7 #include "ui/views/layout/box_layout.h"
8 #include "ui/views/background.h" 8 #include "ui/views/background.h"
9 #include "ui/views/border.h" 9 #include "ui/views/border.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 26 matching lines...) Expand all
37 views::View* TrayEmpty::CreateTrayView(user::LoginStatus status) { 37 views::View* TrayEmpty::CreateTrayView(user::LoginStatus status) {
38 return NULL; 38 return NULL;
39 } 39 }
40 40
41 views::View* TrayEmpty::CreateDefaultView(user::LoginStatus status) { 41 views::View* TrayEmpty::CreateDefaultView(user::LoginStatus status) {
42 if (status == user::LOGGED_IN_NONE) 42 if (status == user::LOGGED_IN_NONE)
43 return NULL; 43 return NULL;
44 44
45 views::View* view = new views::View; 45 views::View* view = new views::View;
46 view->set_background(new EmptyBackground()); 46 view->set_background(new EmptyBackground());
47 view->set_border(views::Border::CreateEmptyBorder(10, 0, 0, 0)); 47 view->SetBorder(views::Border::CreateEmptyBorder(10, 0, 0, 0));
48 view->SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 48 view->SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
49 0, 0, 0)); 49 0, 0, 0));
50 view->SetPaintToLayer(true); 50 view->SetPaintToLayer(true);
51 view->SetFillsBoundsOpaquely(false); 51 view->SetFillsBoundsOpaquely(false);
52 return view; 52 return view;
53 } 53 }
54 54
55 views::View* TrayEmpty::CreateDetailedView(user::LoginStatus status) { 55 views::View* TrayEmpty::CreateDetailedView(user::LoginStatus status) {
56 return NULL; 56 return NULL;
57 } 57 }
58 58
59 void TrayEmpty::DestroyTrayView() {} 59 void TrayEmpty::DestroyTrayView() {}
60 60
61 void TrayEmpty::DestroyDefaultView() {} 61 void TrayEmpty::DestroyDefaultView() {}
62 62
63 void TrayEmpty::DestroyDetailedView() {} 63 void TrayEmpty::DestroyDetailedView() {}
64 64
65 void TrayEmpty::UpdateAfterLoginStatusChange(user::LoginStatus status) {} 65 void TrayEmpty::UpdateAfterLoginStatusChange(user::LoginStatus status) {}
66 66
67 } // namespace internal 67 } // namespace internal
68 } // namespace ash 68 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_details_view.cc ('k') | ash/system/tray/tray_popup_label_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698