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

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

Issue 309113003: TrayNotificationView: Initialize uninitialized member in constructor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | « no previous file | no next file » | 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_notification_view.h" 5 #include "ash/system/tray/tray_notification_view.h"
6 6
7 #include "ash/system/tray/system_tray_item.h" 7 #include "ash/system/tray/system_tray_item.h"
8 #include "ash/system/tray/tray_constants.h" 8 #include "ash/system/tray/tray_constants.h"
9 #include "grit/ash_strings.h" 9 #include "grit/ash_strings.h"
10 #include "grit/ui_resources.h" 10 #include "grit/ui_resources.h"
11 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/gfx/image/image_skia.h" 12 #include "ui/gfx/image/image_skia.h"
13 #include "ui/views/background.h" 13 #include "ui/views/background.h"
14 #include "ui/views/controls/button/image_button.h" 14 #include "ui/views/controls/button/image_button.h"
15 #include "ui/views/controls/image_view.h" 15 #include "ui/views/controls/image_view.h"
16 #include "ui/views/layout/grid_layout.h" 16 #include "ui/views/layout/grid_layout.h"
17 17
18 namespace ash { 18 namespace ash {
19 19
20 TrayNotificationView::TrayNotificationView(SystemTrayItem* owner, int icon_id) 20 TrayNotificationView::TrayNotificationView(SystemTrayItem* owner, int icon_id)
21 : owner_(owner), 21 : owner_(owner),
22 icon_id_(icon_id), 22 icon_id_(icon_id),
23 icon_(NULL) { 23 icon_(NULL),
24 autoclose_delay_(0) {
24 } 25 }
25 26
26 TrayNotificationView::~TrayNotificationView() { 27 TrayNotificationView::~TrayNotificationView() {
27 } 28 }
28 29
29 void TrayNotificationView::InitView(views::View* contents) { 30 void TrayNotificationView::InitView(views::View* contents) {
30 set_background(views::Background::CreateSolidBackground(kBackgroundColor)); 31 set_background(views::Background::CreateSolidBackground(kBackgroundColor));
31 32
32 views::GridLayout* layout = new views::GridLayout(this); 33 views::GridLayout* layout = new views::GridLayout(this);
33 SetLayoutManager(layout); 34 SetLayoutManager(layout);
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 OnClose(); 162 OnClose();
162 owner_->HideNotificationView(); 163 owner_->HideNotificationView();
163 } 164 }
164 165
165 void TrayNotificationView::HandleClickAction() { 166 void TrayNotificationView::HandleClickAction() {
166 HandleClose(); 167 HandleClose();
167 OnClickAction(); 168 OnClickAction();
168 } 169 }
169 170
170 } // namespace ash 171 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698