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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 10443091: Make BrowserMainParts have an empty implementation to make embedding easier. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 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/views/ash/chrome_browser_main_extra_parts_ash.h" 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/high_contrast/high_contrast_controller.h" 9 #include "ash/high_contrast/high_contrast_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 19 matching lines...) Expand all
30 30
31 #if defined(OS_CHROMEOS) 31 #if defined(OS_CHROMEOS)
32 #include "base/chromeos/chromeos_version.h" 32 #include "base/chromeos/chromeos_version.h"
33 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 33 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
34 #include "chrome/browser/chromeos/login/user_manager.h" 34 #include "chrome/browser/chromeos/login/user_manager.h"
35 #include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h" 35 #include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h"
36 #include "chrome/browser/ui/views/ash/ime_controller_chromeos.h" 36 #include "chrome/browser/ui/views/ash/ime_controller_chromeos.h"
37 #include "chrome/browser/ui/views/ash/volume_controller_chromeos.h" 37 #include "chrome/browser/ui/views/ash/volume_controller_chromeos.h"
38 #endif 38 #endif
39 39
40 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() 40 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {
41 : ChromeBrowserMainExtraParts() {
42 } 41 }
43 42
44 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() { 43 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {
45 } 44 }
46 45
47 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { 46 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
48 #if defined(OS_CHROMEOS) 47 #if defined(OS_CHROMEOS)
49 if (base::chromeos::IsRunningOnChromeOS() || 48 if (base::chromeos::IsRunningOnChromeOS() ||
50 CommandLine::ForCurrentProcess()->HasSwitch( 49 CommandLine::ForCurrentProcess()->HasSwitch(
51 switches::kAuraHostWindowUseFullscreen)) { 50 switches::kAuraHostWindowUseFullscreen)) {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 ash::Shell::DeleteInstance(); 100 ash::Shell::DeleteInstance();
102 } 101 }
103 102
104 namespace browser { 103 namespace browser {
105 104
106 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) { 105 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) {
107 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); 106 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
108 } 107 }
109 108
110 } // namespace browser 109 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698