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

Side by Side Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 5 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
6 6
7 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" 7 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
8 #include "chrome/browser/ui/views/chrome_views_delegate.h" 8 #include "chrome/browser/ui/views/chrome_views_delegate.h"
9 #include "components/constrained_window/constrained_window_views.h" 9 #include "components/constrained_window/constrained_window_views.h"
10 10
11 #if defined(USE_AURA) 11 #if defined(USE_AURA)
12 #include "ui/gfx/screen.h" 12 #include "ui/display/screen.h"
13 #include "ui/views/widget/desktop_aura/desktop_screen.h" 13 #include "ui/views/widget/desktop_aura/desktop_screen.h"
14 #include "ui/wm/core/wm_state.h" 14 #include "ui/wm/core/wm_state.h"
15 #endif 15 #endif
16 16
17 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { 17 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
18 } 18 }
19 19
20 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() { 20 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {
21 constrained_window::SetConstrainedWindowViewsClient(nullptr); 21 constrained_window::SetConstrainedWindowViewsClient(nullptr);
22 } 22 }
23 23
24 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() { 24 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
25 // The delegate needs to be set before any UI is created so that windows 25 // The delegate needs to be set before any UI is created so that windows
26 // display the correct icon. 26 // display the correct icon.
27 if (!views::ViewsDelegate::GetInstance()) 27 if (!views::ViewsDelegate::GetInstance())
28 views_delegate_.reset(new ChromeViewsDelegate); 28 views_delegate_.reset(new ChromeViewsDelegate);
29 29
30 SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient()); 30 SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
31 31
32 #if defined(USE_AURA) 32 #if defined(USE_AURA)
33 wm_state_.reset(new wm::WMState); 33 wm_state_.reset(new wm::WMState);
34 #endif 34 #endif
35 } 35 }
36 36
37 void ChromeBrowserMainExtraPartsViews::PreCreateThreads() { 37 void ChromeBrowserMainExtraPartsViews::PreCreateThreads() {
38 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 38 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
39 gfx::Screen::SetScreenInstance(views::CreateDesktopScreen()); 39 display::Screen::SetScreenInstance(views::CreateDesktopScreen());
40 #endif 40 #endif
41 } 41 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698