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

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

Issue 18967002: Small cleanup for ChromeBrowserMain: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
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/toolkit_extra_parts.h"
9 #include "chrome/browser/ui/aura/active_desktop_monitor.h" 8 #include "chrome/browser/ui/aura/active_desktop_monitor.h"
10 #include "chrome/browser/ui/host_desktop.h" 9 #include "chrome/browser/ui/host_desktop.h"
11 #include "ui/aura/env.h" 10 #include "ui/aura/env.h"
12 #include "ui/gfx/screen.h" 11 #include "ui/gfx/screen.h"
13 #include "ui/views/widget/desktop_aura/desktop_screen.h" 12 #include "ui/views/widget/desktop_aura/desktop_screen.h"
14 #include "ui/views/widget/native_widget_aura.h" 13 #include "ui/views/widget/native_widget_aura.h"
15 14
16 #if defined(OS_LINUX) 15 #if defined(OS_LINUX)
17 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" 16 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
18 #include "ui/linux_ui/linux_ui.h" 17 #include "ui/linux_ui/linux_ui.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 ui::LinuxUI::SetInstance(BuildGtk2UI()); 65 ui::LinuxUI::SetInstance(BuildGtk2UI());
67 #endif 66 #endif
68 } 67 }
69 68
70 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { 69 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
71 active_desktop_monitor_.reset(); 70 active_desktop_monitor_.reset();
72 71
73 // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown 72 // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
74 // after the metrics service is deleted. 73 // after the metrics service is deleted.
75 } 74 }
76
77 namespace chrome {
78
79 void AddAuraToolkitExtraParts(ChromeBrowserMainParts* main_parts) {
80 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
81 }
82
83 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698