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

Side by Side Diff: ash/first_run/first_run_helper_impl.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
Patch Set: cleanup test Created 4 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/first_run/first_run_helper_impl.h" 5 #include "ash/first_run/first_run_helper_impl.h"
6 6
7 #include "ash/common/shell_window_ids.h" 7 #include "ash/common/shell_window_ids.h"
8 #include "ash/common/system/tray/system_tray.h"
8 #include "ash/shelf/app_list_button.h" 9 #include "ash/shelf/app_list_button.h"
9 #include "ash/shelf/shelf.h" 10 #include "ash/shelf/shelf.h"
10 #include "ash/shell.h" 11 #include "ash/shell.h"
11 #include "ash/system/tray/system_tray.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "ui/app_list/views/app_list_view.h" 13 #include "ui/app_list/views/app_list_view.h"
14 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
15 #include "ui/display/display.h" 15 #include "ui/display/display.h"
16 #include "ui/display/screen.h" 16 #include "ui/display/screen.h"
17 #include "ui/gfx/geometry/rect.h" 17 #include "ui/gfx/geometry/rect.h"
18 #include "ui/views/view.h" 18 #include "ui/views/view.h"
19 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 20
21 namespace ash { 21 namespace ash {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 return bubble->GetBoundsInScreen(); 92 return bubble->GetBoundsInScreen();
93 } 93 }
94 94
95 gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() { 95 gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() {
96 SystemTray* tray = Shell::GetInstance()->GetPrimarySystemTray(); 96 SystemTray* tray = Shell::GetInstance()->GetPrimarySystemTray();
97 views::View* help_button = tray->GetHelpButtonView(); 97 views::View* help_button = tray->GetHelpButtonView();
98 return help_button->GetBoundsInScreen(); 98 return help_button->GetBoundsInScreen();
99 } 99 }
100 100
101 } // namespace ash 101 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698