| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 #include "chrome/browser/chromeos/cros/mount_library.h" | 96 #include "chrome/browser/chromeos/cros/mount_library.h" |
| 97 #include "chrome/browser/chromeos/cros/network_library.h" | 97 #include "chrome/browser/chromeos/cros/network_library.h" |
| 98 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" | 98 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" |
| 99 #include "chrome/browser/chromeos/customization_document.h" | 99 #include "chrome/browser/chromeos/customization_document.h" |
| 100 #include "chrome/browser/chromeos/enterprise_extension_observer.h" | 100 #include "chrome/browser/chromeos/enterprise_extension_observer.h" |
| 101 #include "chrome/browser/chromeos/gview_request_interceptor.h" | 101 #include "chrome/browser/chromeos/gview_request_interceptor.h" |
| 102 #include "chrome/browser/chromeos/low_battery_observer.h" | 102 #include "chrome/browser/chromeos/low_battery_observer.h" |
| 103 #include "chrome/browser/chromeos/network_message_observer.h" | 103 #include "chrome/browser/chromeos/network_message_observer.h" |
| 104 #include "chrome/browser/chromeos/sms_observer.h" | 104 #include "chrome/browser/chromeos/sms_observer.h" |
| 105 #if defined(TOOLKIT_USES_GTK) | 105 #if defined(TOOLKIT_USES_GTK) |
| 106 #include "chrome/browser/chromeos/wm_message_listener.h" | 106 #include "chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h" |
| 107 #endif | 107 #endif |
| 108 #endif | 108 #endif |
| 109 | 109 |
| 110 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) | 110 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) |
| 111 #include "ui/base/touch/touch_factory.h" | 111 #include "ui/base/touch/touch_factory.h" |
| 112 #endif | 112 #endif |
| 113 | 113 |
| 114 using content::BrowserThread; | 114 using content::BrowserThread; |
| 115 | 115 |
| 116 namespace { | 116 namespace { |
| (...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1549 if (!automation->InitializeChannel(channel_id)) | 1549 if (!automation->InitializeChannel(channel_id)) |
| 1550 return false; | 1550 return false; |
| 1551 automation->SetExpectedTabCount(expected_tabs); | 1551 automation->SetExpectedTabCount(expected_tabs); |
| 1552 | 1552 |
| 1553 AutomationProviderList* list = g_browser_process->GetAutomationProviderList(); | 1553 AutomationProviderList* list = g_browser_process->GetAutomationProviderList(); |
| 1554 DCHECK(list); | 1554 DCHECK(list); |
| 1555 list->AddProvider(automation); | 1555 list->AddProvider(automation); |
| 1556 | 1556 |
| 1557 return true; | 1557 return true; |
| 1558 } | 1558 } |
| OLD | NEW |