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

Side by Side Diff: ash/first_run/first_run_helper_impl.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 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/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/shelf/app_list_button.h" 8 #include "ash/shelf/app_list_button.h"
9 #include "ash/shelf/shelf_widget.h" 9 #include "ash/shelf/shelf_widget.h"
10 #include "ash/shelf/wm_shelf.h" 10 #include "ash/shelf/wm_shelf.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/shell_port.h"
12 #include "ash/system/tray/system_tray.h" 13 #include "ash/system/tray/system_tray.h"
13 #include "ash/wm_shell.h"
14 #include "ash/wm_window.h" 14 #include "ash/wm_window.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "ui/app_list/views/app_list_view.h" 16 #include "ui/app_list/views/app_list_view.h"
17 #include "ui/aura/window.h" 17 #include "ui/aura/window.h"
18 #include "ui/display/display.h" 18 #include "ui/display/display.h"
19 #include "ui/display/screen.h" 19 #include "ui/display/screen.h"
20 #include "ui/gfx/geometry/rect.h" 20 #include "ui/gfx/geometry/rect.h"
21 #include "ui/views/view.h" 21 #include "ui/views/view.h"
22 #include "ui/views/widget/widget.h" 22 #include "ui/views/widget/widget.h"
23 23
(...skipping 25 matching lines...) Expand all
49 if (IsTrayBubbleOpened()) 49 if (IsTrayBubbleOpened())
50 CloseTrayBubble(); 50 CloseTrayBubble();
51 widget_->Close(); 51 widget_->Close();
52 } 52 }
53 53
54 views::Widget* FirstRunHelperImpl::GetOverlayWidget() { 54 views::Widget* FirstRunHelperImpl::GetOverlayWidget() {
55 return widget_; 55 return widget_;
56 } 56 }
57 57
58 gfx::Rect FirstRunHelperImpl::GetAppListButtonBounds() { 58 gfx::Rect FirstRunHelperImpl::GetAppListButtonBounds() {
59 WmShelf* shelf = WmShelf::ForWindow(WmShell::Get()->GetPrimaryRootWindow()); 59 WmShelf* shelf = WmShelf::ForWindow(ShellPort::Get()->GetPrimaryRootWindow());
60 AppListButton* app_button = shelf->shelf_widget()->GetAppListButton(); 60 AppListButton* app_button = shelf->shelf_widget()->GetAppListButton();
61 return app_button->GetBoundsInScreen(); 61 return app_button->GetBoundsInScreen();
62 } 62 }
63 63
64 void FirstRunHelperImpl::Cancel() { 64 void FirstRunHelperImpl::Cancel() {
65 for (auto& observer : observers()) 65 for (auto& observer : observers())
66 observer.OnCancelled(); 66 observer.OnCancelled();
67 } 67 }
68 68
69 bool FirstRunHelperImpl::IsCancelingKeyEvent(ui::KeyEvent* event) { 69 bool FirstRunHelperImpl::IsCancelingKeyEvent(ui::KeyEvent* event) {
(...skipping 26 matching lines...) Expand all
96 return bubble->GetBoundsInScreen(); 96 return bubble->GetBoundsInScreen();
97 } 97 }
98 98
99 gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() { 99 gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() {
100 SystemTray* tray = Shell::Get()->GetPrimarySystemTray(); 100 SystemTray* tray = Shell::Get()->GetPrimarySystemTray();
101 views::View* help_button = tray->GetHelpButtonView(); 101 views::View* help_button = tray->GetHelpButtonView();
102 return help_button->GetBoundsInScreen(); 102 return help_button->GetBoundsInScreen();
103 } 103 }
104 104
105 } // namespace ash 105 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698