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

Side by Side Diff: ash/system/tiles/tray_tiles.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « ash/system/tiles/tray_tiles.h ('k') | ash/system/tiles/tray_tiles_unittest.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/common/system/tiles/tray_tiles.h" 5 #include "ash/system/tiles/tray_tiles.h"
6 6
7 #include "ash/common/metrics/user_metrics_action.h" 7 #include "ash/common/metrics/user_metrics_action.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/system/tiles/tiles_default_view.h"
10 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/system/tiles/tiles_default_view.h"
11 11
12 namespace ash { 12 namespace ash {
13 13
14 TrayTiles::TrayTiles(SystemTray* system_tray) 14 TrayTiles::TrayTiles(SystemTray* system_tray)
15 : SystemTrayItem(system_tray, UMA_NOT_RECORDED), default_view_(nullptr) {} 15 : SystemTrayItem(system_tray, UMA_NOT_RECORDED), default_view_(nullptr) {}
16 16
17 TrayTiles::~TrayTiles() {} 17 TrayTiles::~TrayTiles() {}
18 18
19 views::View* TrayTiles::GetHelpButtonView() const { 19 views::View* TrayTiles::GetHelpButtonView() const {
20 if (!default_view_) 20 if (!default_view_)
(...skipping 14 matching lines...) Expand all
35 default_view_ = new TilesDefaultView(this, status); 35 default_view_ = new TilesDefaultView(this, status);
36 default_view_->Init(); 36 default_view_->Init();
37 return default_view_; 37 return default_view_;
38 } 38 }
39 39
40 void TrayTiles::DestroyDefaultView() { 40 void TrayTiles::DestroyDefaultView() {
41 default_view_ = nullptr; 41 default_view_ = nullptr;
42 } 42 }
43 43
44 } // namespace ash 44 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tiles/tray_tiles.h ('k') | ash/system/tiles/tray_tiles_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698