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

Side by Side Diff: ui/views_content_client/views_content_client_main_parts_desktop_aura.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase Created 4 years, 11 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "content/shell/browser/shell_browser_context.h" 6 #include "content/shell/browser/shell_browser_context.h"
7 #include "ui/aura/env.h" 7 #include "ui/aura/env.h"
8 #include "ui/gfx/screen.h" 8 #include "ui/gfx/screen.h"
9 #include "ui/views/widget/desktop_aura/desktop_screen.h" 9 #include "ui/views/widget/desktop_aura/desktop_screen.h"
10 #include "ui/views_content_client/views_content_client.h" 10 #include "ui/views_content_client/views_content_client.h"
(...skipping 21 matching lines...) Expand all
32 ViewsContentClientMainPartsDesktopAura::ViewsContentClientMainPartsDesktopAura( 32 ViewsContentClientMainPartsDesktopAura::ViewsContentClientMainPartsDesktopAura(
33 const content::MainFunctionParams& content_params, 33 const content::MainFunctionParams& content_params,
34 ViewsContentClient* views_content_client) 34 ViewsContentClient* views_content_client)
35 : ViewsContentClientMainPartsAura(content_params, views_content_client) { 35 : ViewsContentClientMainPartsAura(content_params, views_content_client) {
36 } 36 }
37 37
38 void ViewsContentClientMainPartsDesktopAura::PreMainMessageLoopRun() { 38 void ViewsContentClientMainPartsDesktopAura::PreMainMessageLoopRun() {
39 ViewsContentClientMainPartsAura::PreMainMessageLoopRun(); 39 ViewsContentClientMainPartsAura::PreMainMessageLoopRun();
40 40
41 aura::Env::CreateInstance(true); 41 aura::Env::CreateInstance(true);
42 gfx::Screen::SetScreenInstance( 42 gfx::Screen::SetScreenInstance(views::CreateDesktopScreen());
43 gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
44 43
45 views_content_client()->task().Run(browser_context(), NULL); 44 views_content_client()->task().Run(browser_context(), NULL);
46 } 45 }
47 46
48 } // namespace 47 } // namespace
49 48
50 // static 49 // static
51 ViewsContentClientMainParts* ViewsContentClientMainParts::Create( 50 ViewsContentClientMainParts* ViewsContentClientMainParts::Create(
52 const content::MainFunctionParams& content_params, 51 const content::MainFunctionParams& content_params,
53 ViewsContentClient* views_content_client) { 52 ViewsContentClient* views_content_client) {
54 return new ViewsContentClientMainPartsDesktopAura( 53 return new ViewsContentClientMainPartsDesktopAura(
55 content_params, views_content_client); 54 content_params, views_content_client);
56 } 55 }
57 56
58 } // namespace ui 57 } // namespace ui
OLDNEW
« no previous file with comments | « ui/views_content_client/views_content_client_main_parts_chromeos.cc ('k') | ui/wm/core/default_screen_position_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698