| OLD | NEW |
| 1 // Copyright (c) 2010 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 "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| 11 #include "base/environment.h" | 11 #include "base/environment.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 #include "grit/theme_resources.h" | 66 #include "grit/theme_resources.h" |
| 67 #include "net/base/net_util.h" | 67 #include "net/base/net_util.h" |
| 68 #include "net/url_request/url_request.h" | 68 #include "net/url_request/url_request.h" |
| 69 #include "webkit/glue/webkit_glue.h" | 69 #include "webkit/glue/webkit_glue.h" |
| 70 | 70 |
| 71 #if defined(OS_MACOSX) | 71 #if defined(OS_MACOSX) |
| 72 #include "chrome/browser/ui/cocoa/keystone_infobar.h" | 72 #include "chrome/browser/ui/cocoa/keystone_infobar.h" |
| 73 #endif | 73 #endif |
| 74 | 74 |
| 75 #if defined(TOOLKIT_GTK) | 75 #if defined(TOOLKIT_GTK) |
| 76 #include "chrome/browser/gtk/gtk_util.h" | 76 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 77 #endif | 77 #endif |
| 78 | 78 |
| 79 #if defined(OS_CHROMEOS) | 79 #if defined(OS_CHROMEOS) |
| 80 #include "chrome/browser/chromeos/brightness_observer.h" | 80 #include "chrome/browser/chromeos/brightness_observer.h" |
| 81 #include "chrome/browser/chromeos/cros/cros_library.h" | 81 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 82 #include "chrome/browser/chromeos/cros/mount_library.h" | 82 #include "chrome/browser/chromeos/cros/mount_library.h" |
| 83 #include "chrome/browser/chromeos/cros/network_library.h" | 83 #include "chrome/browser/chromeos/cros/network_library.h" |
| 84 #include "chrome/browser/chromeos/customization_document.h" | 84 #include "chrome/browser/chromeos/customization_document.h" |
| 85 #include "chrome/browser/chromeos/enterprise_extension_observer.h" | 85 #include "chrome/browser/chromeos/enterprise_extension_observer.h" |
| 86 #include "chrome/browser/chromeos/gview_request_interceptor.h" | 86 #include "chrome/browser/chromeos/gview_request_interceptor.h" |
| (...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1096 return false; | 1096 return false; |
| 1097 automation->SetExpectedTabCount(expected_tabs); | 1097 automation->SetExpectedTabCount(expected_tabs); |
| 1098 | 1098 |
| 1099 AutomationProviderList* list = | 1099 AutomationProviderList* list = |
| 1100 g_browser_process->InitAutomationProviderList(); | 1100 g_browser_process->InitAutomationProviderList(); |
| 1101 DCHECK(list); | 1101 DCHECK(list); |
| 1102 list->AddProvider(automation); | 1102 list->AddProvider(automation); |
| 1103 | 1103 |
| 1104 return true; | 1104 return true; |
| 1105 } | 1105 } |
| OLD | NEW |