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

Side by Side Diff: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Issue 52783003: linux_aura: Move the first creation of DesktopScreen after ResourceBundle initialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed method declaration order Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/aura/chrome_browser_main_extra_parts_aura.h" 5 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h"
6 6
7 #include "chrome/browser/chrome_browser_main.h" 7 #include "chrome/browser/chrome_browser_main.h"
8 #include "chrome/browser/ui/aura/active_desktop_monitor.h" 8 #include "chrome/browser/ui/aura/active_desktop_monitor.h"
9 #include "chrome/browser/ui/host_desktop.h" 9 #include "chrome/browser/ui/host_desktop.h"
10 #include "ui/aura/env.h" 10 #include "ui/aura/env.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 aura::Env::CreateInstance(); 61 aura::Env::CreateInstance();
62 active_desktop_monitor_.reset(new ActiveDesktopMonitor(GetInitialDesktop())); 62 active_desktop_monitor_.reset(new ActiveDesktopMonitor(GetInitialDesktop()));
63 #endif 63 #endif
64 #endif 64 #endif
65 65
66 #if !defined(USE_ASH) && defined(OS_LINUX) && defined(USE_X11) 66 #if !defined(USE_ASH) && defined(OS_LINUX) && defined(USE_X11)
67 views::LinuxUI::instance()->Initialize(); 67 views::LinuxUI::instance()->Initialize();
68 #endif 68 #endif
69 } 69 }
70 70
71 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopStart() { 71 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() {
72 #if !defined(OS_CHROMEOS) 72 #if !defined(OS_CHROMEOS)
73 #if defined(USE_ASH) 73 #if defined(USE_ASH)
74 if (!chrome::ShouldOpenAshOnStartup()) 74 if (!chrome::ShouldOpenAshOnStartup())
75 #endif 75 #endif
76 { 76 {
77 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, 77 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
78 views::CreateDesktopScreen()); 78 views::CreateDesktopScreen());
Ben Goodger (Google) 2013/11/05 17:44:11 Where's the ResourceBundle dependency here? I took
79 } 79 }
80 #endif 80 #endif
81 } 81 }
82 82
83 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { 83 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
84 active_desktop_monitor_.reset(); 84 active_desktop_monitor_.reset();
85 85
86 // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown 86 // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
87 // after the metrics service is deleted. 87 // after the metrics service is deleted.
88 } 88 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698