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 "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | |
11 #include "base/environment.h" | 10 #include "base/environment.h" |
12 #include "base/event_recorder.h" | 11 #include "base/event_recorder.h" |
13 #include "base/file_path.h" | 12 #include "base/file_path.h" |
14 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
15 #include "base/path_service.h" | 14 #include "base/path_service.h" |
16 #include "base/scoped_ptr.h" | 15 #include "base/scoped_ptr.h" |
17 #include "base/string_number_conversions.h" | 16 #include "base/string_number_conversions.h" |
18 #include "base/string_split.h" | 17 #include "base/string_split.h" |
19 #include "base/threading/thread_restrictions.h" | 18 #include "base/threading/thread_restrictions.h" |
20 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 #include "chrome/common/pref_names.h" | 58 #include "chrome/common/pref_names.h" |
60 #include "chrome/common/result_codes.h" | 59 #include "chrome/common/result_codes.h" |
61 #include "chrome/common/url_constants.h" | 60 #include "chrome/common/url_constants.h" |
62 #include "chrome/installer/util/browser_distribution.h" | 61 #include "chrome/installer/util/browser_distribution.h" |
63 #include "grit/chromium_strings.h" | 62 #include "grit/chromium_strings.h" |
64 #include "grit/generated_resources.h" | 63 #include "grit/generated_resources.h" |
65 #include "grit/locale_settings.h" | 64 #include "grit/locale_settings.h" |
66 #include "grit/theme_resources.h" | 65 #include "grit/theme_resources.h" |
67 #include "net/base/net_util.h" | 66 #include "net/base/net_util.h" |
68 #include "net/url_request/url_request.h" | 67 #include "net/url_request/url_request.h" |
| 68 #include "ui/base/resource/resource_bundle.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/ui/gtk/gtk_util.h" | 76 #include "chrome/browser/ui/gtk/gtk_util.h" |
77 #endif | 77 #endif |
78 | 78 |
(...skipping 1017 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 |