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

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

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/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/display/screen.h"
14 #include "ui/gfx/geometry/rect.h" 15 #include "ui/gfx/geometry/rect.h"
15 #include "ui/gfx/screen.h"
16 #include "ui/views/view.h" 16 #include "ui/views/view.h"
17 #include "ui/views/widget/widget.h" 17 #include "ui/views/widget/widget.h"
18 18
19 namespace ash { 19 namespace ash {
20 20
21 namespace { 21 namespace {
22 22
23 views::Widget* CreateFirstRunWindow() { 23 views::Widget* CreateFirstRunWindow() {
24 views::Widget::InitParams params( 24 views::Widget::InitParams params(
25 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 25 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
26 params.bounds = gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds(); 26 params.bounds = display::Screen::GetScreen()->GetPrimaryDisplay().bounds();
27 params.show_state = ui::SHOW_STATE_FULLSCREEN; 27 params.show_state = ui::SHOW_STATE_FULLSCREEN;
28 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 28 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
29 params.parent = Shell::GetContainer(Shell::GetPrimaryRootWindow(), 29 params.parent = Shell::GetContainer(Shell::GetPrimaryRootWindow(),
30 ash::kShellWindowId_OverlayContainer); 30 ash::kShellWindowId_OverlayContainer);
31 views::Widget* window = new views::Widget; 31 views::Widget* window = new views::Widget;
32 window->Init(params); 32 window->Init(params);
33 return window; 33 return window;
34 } 34 }
35 35
36 } // anonymous namespace 36 } // anonymous namespace
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 return bubble->GetBoundsInScreen(); 91 return bubble->GetBoundsInScreen();
92 } 92 }
93 93
94 gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() { 94 gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() {
95 SystemTray* tray = Shell::GetInstance()->GetPrimarySystemTray(); 95 SystemTray* tray = Shell::GetInstance()->GetPrimarySystemTray();
96 views::View* help_button = tray->GetHelpButtonView(); 96 views::View* help_button = tray->GetHelpButtonView();
97 return help_button->GetBoundsInScreen(); 97 return help_button->GetBoundsInScreen();
98 } 98 }
99 99
100 } // namespace ash 100 } // namespace ash
OLDNEW
« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/frame/caption_buttons/frame_size_button_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698