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/environment.h" | 9 #include "base/environment.h" |
10 #include "base/event_recorder.h" | 10 #include "base/event_recorder.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 #include "chrome/browser/notifications/desktop_notification_service.h" | 33 #include "chrome/browser/notifications/desktop_notification_service.h" |
34 #include "chrome/browser/prefs/pref_service.h" | 34 #include "chrome/browser/prefs/pref_service.h" |
35 #include "chrome/browser/prefs/session_startup_pref.h" | 35 #include "chrome/browser/prefs/session_startup_pref.h" |
36 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 36 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
37 #include "chrome/browser/profiles/profile.h" | 37 #include "chrome/browser/profiles/profile.h" |
38 #include "chrome/browser/search_engines/template_url.h" | 38 #include "chrome/browser/search_engines/template_url.h" |
39 #include "chrome/browser/search_engines/template_url_model.h" | 39 #include "chrome/browser/search_engines/template_url_model.h" |
40 #include "chrome/browser/sessions/session_restore.h" | 40 #include "chrome/browser/sessions/session_restore.h" |
41 #include "chrome/browser/sessions/session_service.h" | 41 #include "chrome/browser/sessions/session_service.h" |
42 #include "chrome/browser/shell_integration.h" | 42 #include "chrome/browser/shell_integration.h" |
43 #include "chrome/browser/tab_contents/infobar_delegate.h" | 43 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" |
| 44 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" |
44 #include "chrome/browser/tabs/pinned_tab_codec.h" | 45 #include "chrome/browser/tabs/pinned_tab_codec.h" |
45 #include "chrome/browser/tabs/tab_strip_model.h" | 46 #include "chrome/browser/tabs/tab_strip_model.h" |
46 #include "chrome/browser/ui/browser_navigator.h" | 47 #include "chrome/browser/ui/browser_navigator.h" |
47 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 48 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
48 #include "chrome/common/chrome_constants.h" | 49 #include "chrome/common/chrome_constants.h" |
49 #include "chrome/common/chrome_paths.h" | 50 #include "chrome/common/chrome_paths.h" |
50 #include "chrome/common/chrome_switches.h" | 51 #include "chrome/common/chrome_switches.h" |
51 #include "chrome/common/extensions/extension_constants.h" | 52 #include "chrome/common/extensions/extension_constants.h" |
52 #include "chrome/common/pref_names.h" | 53 #include "chrome/common/pref_names.h" |
53 #include "chrome/common/result_codes.h" | 54 #include "chrome/common/result_codes.h" |
(...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1337 return false; | 1338 return false; |
1338 automation->SetExpectedTabCount(expected_tabs); | 1339 automation->SetExpectedTabCount(expected_tabs); |
1339 | 1340 |
1340 AutomationProviderList* list = | 1341 AutomationProviderList* list = |
1341 g_browser_process->InitAutomationProviderList(); | 1342 g_browser_process->InitAutomationProviderList(); |
1342 DCHECK(list); | 1343 DCHECK(list); |
1343 list->AddProvider(automation); | 1344 list->AddProvider(automation); |
1344 | 1345 |
1345 return true; | 1346 return true; |
1346 } | 1347 } |
OLD | NEW |