OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser_init.h" | 5 #include "chrome/browser/ui/browser_init.h" |
6 | 6 |
7 #include <algorithm> // For max(). | 7 #include <algorithm> // For max(). |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/environment.h" | 10 #include "base/environment.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 #include "chrome/browser/chromeos/cros/network_library.h" | 88 #include "chrome/browser/chromeos/cros/network_library.h" |
89 #include "chrome/browser/chromeos/customization_document.h" | 89 #include "chrome/browser/chromeos/customization_document.h" |
90 #include "chrome/browser/chromeos/enterprise_extension_observer.h" | 90 #include "chrome/browser/chromeos/enterprise_extension_observer.h" |
91 #include "chrome/browser/chromeos/gview_request_interceptor.h" | 91 #include "chrome/browser/chromeos/gview_request_interceptor.h" |
92 #include "chrome/browser/chromeos/low_battery_observer.h" | 92 #include "chrome/browser/chromeos/low_battery_observer.h" |
93 #include "chrome/browser/chromeos/network_message_observer.h" | 93 #include "chrome/browser/chromeos/network_message_observer.h" |
94 #include "chrome/browser/chromeos/network_state_notifier.h" | 94 #include "chrome/browser/chromeos/network_state_notifier.h" |
95 #include "chrome/browser/chromeos/sms_observer.h" | 95 #include "chrome/browser/chromeos/sms_observer.h" |
96 #include "chrome/browser/chromeos/update_observer.h" | 96 #include "chrome/browser/chromeos/update_observer.h" |
97 #include "chrome/browser/chromeos/wm_message_listener.h" | 97 #include "chrome/browser/chromeos/wm_message_listener.h" |
98 #include "chrome/browser/ui/webui/mediaplayer_ui.h" | |
99 #endif | 98 #endif |
100 | 99 |
101 #if defined(HAVE_XINPUT2) | 100 #if defined(HAVE_XINPUT2) |
102 #include "views/focus/accelerator_handler.h" | 101 #include "views/focus/accelerator_handler.h" |
103 #endif | 102 #endif |
104 | 103 |
105 namespace { | 104 namespace { |
106 | 105 |
107 // SetAsDefaultBrowserTask ---------------------------------------------------- | 106 // SetAsDefaultBrowserTask ---------------------------------------------------- |
108 | 107 |
(...skipping 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1419 return false; | 1418 return false; |
1420 automation->SetExpectedTabCount(expected_tabs); | 1419 automation->SetExpectedTabCount(expected_tabs); |
1421 | 1420 |
1422 AutomationProviderList* list = | 1421 AutomationProviderList* list = |
1423 g_browser_process->InitAutomationProviderList(); | 1422 g_browser_process->InitAutomationProviderList(); |
1424 DCHECK(list); | 1423 DCHECK(list); |
1425 list->AddProvider(automation); | 1424 list->AddProvider(automation); |
1426 | 1425 |
1427 return true; | 1426 return true; |
1428 } | 1427 } |
OLD | NEW |