OLD | NEW |
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/shelf/shelf.h" | 7 #include "ash/shelf/shelf.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
10 #include "ash/system/tray/system_tray.h" | 10 #include "ash/system/tray/system_tray.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "ui/app_list/views/app_list_view.h" | 12 #include "ui/app_list/views/app_list_view.h" |
13 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
14 #include "ui/gfx/geometry/rect.h" | 14 #include "ui/gfx/geometry/rect.h" |
| 15 #include "ui/gfx/screen.h" |
15 #include "ui/views/view.h" | 16 #include "ui/views/view.h" |
16 #include "ui/views/widget/widget.h" | 17 #include "ui/views/widget/widget.h" |
17 | 18 |
18 namespace ash { | 19 namespace ash { |
19 | 20 |
20 namespace { | 21 namespace { |
21 | 22 |
22 views::Widget* CreateFirstRunWindow() { | 23 views::Widget* CreateFirstRunWindow() { |
23 views::Widget::InitParams params( | 24 views::Widget::InitParams params( |
24 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); | 25 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
25 params.bounds = Shell::GetScreen()->GetPrimaryDisplay().bounds(); | 26 params.bounds = gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds(); |
26 params.show_state = ui::SHOW_STATE_FULLSCREEN; | 27 params.show_state = ui::SHOW_STATE_FULLSCREEN; |
27 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 28 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
28 params.parent = Shell::GetContainer(Shell::GetPrimaryRootWindow(), | 29 params.parent = Shell::GetContainer(Shell::GetPrimaryRootWindow(), |
29 ash::kShellWindowId_OverlayContainer); | 30 ash::kShellWindowId_OverlayContainer); |
30 views::Widget* window = new views::Widget; | 31 views::Widget* window = new views::Widget; |
31 window->Init(params); | 32 window->Init(params); |
32 return window; | 33 return window; |
33 } | 34 } |
34 | 35 |
35 } // anonymous namespace | 36 } // anonymous namespace |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 return bubble->GetBoundsInScreen(); | 109 return bubble->GetBoundsInScreen(); |
109 } | 110 } |
110 | 111 |
111 gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() { | 112 gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() { |
112 SystemTray* tray = Shell::GetInstance()->GetPrimarySystemTray(); | 113 SystemTray* tray = Shell::GetInstance()->GetPrimarySystemTray(); |
113 views::View* help_button = tray->GetHelpButtonView(); | 114 views::View* help_button = tray->GetHelpButtonView(); |
114 return help_button->GetBoundsInScreen(); | 115 return help_button->GetBoundsInScreen(); |
115 } | 116 } |
116 | 117 |
117 } // namespace ash | 118 } // namespace ash |
OLD | NEW |