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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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
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/system/tiles/tray_tiles.h" 5 #include "ash/system/tiles/tray_tiles.h"
6 6
7 #include "ash/metrics/user_metrics_action.h" 7 #include "ash/metrics/user_metrics_action.h"
8 #include "ash/session/session_state_delegate.h" 8 #include "ash/session/session_state_delegate.h"
9 #include "ash/system/tiles/tiles_default_view.h" 9 #include "ash/system/tiles/tiles_default_view.h"
10 #include "ash/wm_shell.h"
11 10
12 namespace ash { 11 namespace ash {
13 12
14 TrayTiles::TrayTiles(SystemTray* system_tray) 13 TrayTiles::TrayTiles(SystemTray* system_tray)
15 : SystemTrayItem(system_tray, UMA_NOT_RECORDED), default_view_(nullptr) {} 14 : SystemTrayItem(system_tray, UMA_NOT_RECORDED), default_view_(nullptr) {}
16 15
17 TrayTiles::~TrayTiles() {} 16 TrayTiles::~TrayTiles() {}
18 17
19 views::View* TrayTiles::GetHelpButtonView() const { 18 views::View* TrayTiles::GetHelpButtonView() const {
20 if (!default_view_) 19 if (!default_view_)
(...skipping 14 matching lines...) Expand all
35 default_view_ = new TilesDefaultView(this, status); 34 default_view_ = new TilesDefaultView(this, status);
36 default_view_->Init(); 35 default_view_->Init();
37 return default_view_; 36 return default_view_;
38 } 37 }
39 38
40 void TrayTiles::DestroyDefaultView() { 39 void TrayTiles::DestroyDefaultView() {
41 default_view_ = nullptr; 40 default_view_ = nullptr;
42 } 41 }
43 42
44 } // namespace ash 43 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698