Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(670)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/browser_init.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/browser_child_process_host.cc ('k') | chrome/browser/browser_main.cc » ('j') | chrome/chrome_browser.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser_init.h" 5 #include "chrome/browser/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"
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/child_process_security_policy.h" 26 #include "chrome/browser/child_process_security_policy.h"
27 #include "chrome/browser/chrome_thread.h" 27 #include "chrome/browser/chrome_thread.h"
28 #include "chrome/browser/defaults.h" 28 #include "chrome/browser/defaults.h"
29 #include "chrome/browser/extensions/extension_creator.h" 29 #include "chrome/browser/extensions/extension_creator.h"
30 #include "chrome/browser/extensions/extensions_service.h" 30 #include "chrome/browser/extensions/extensions_service.h"
31 #include "chrome/browser/extensions/pack_extension_job.h" 31 #include "chrome/browser/extensions/pack_extension_job.h"
32 #include "chrome/browser/first_run/first_run.h" 32 #include "chrome/browser/first_run/first_run.h"
33 #include "chrome/browser/net/predictor_api.h" 33 #include "chrome/browser/net/predictor_api.h"
34 #include "chrome/browser/net/url_fixer_upper.h" 34 #include "chrome/browser/net/url_fixer_upper.h"
35 #include "chrome/browser/notifications/desktop_notification_service.h" 35 #include "chrome/browser/notifications/desktop_notification_service.h"
36 #include "chrome/browser/pref_service.h" 36 #include "chrome/browser/prefs/pref_service.h"
37 #include "chrome/browser/prefs/session_startup_pref.h"
37 #include "chrome/browser/profile.h" 38 #include "chrome/browser/profile.h"
38 #include "chrome/browser/renderer_host/render_process_host.h" 39 #include "chrome/browser/renderer_host/render_process_host.h"
39 #include "chrome/browser/search_engines/template_url_model.h" 40 #include "chrome/browser/search_engines/template_url_model.h"
40 #include "chrome/browser/session_startup_pref.h"
41 #include "chrome/browser/sessions/session_restore.h" 41 #include "chrome/browser/sessions/session_restore.h"
42 #include "chrome/browser/sessions/session_service.h" 42 #include "chrome/browser/sessions/session_service.h"
43 #include "chrome/browser/shell_integration.h" 43 #include "chrome/browser/shell_integration.h"
44 #include "chrome/browser/tab_contents/infobar_delegate.h" 44 #include "chrome/browser/tab_contents/infobar_delegate.h"
45 #include "chrome/browser/tab_contents/navigation_controller.h" 45 #include "chrome/browser/tab_contents/navigation_controller.h"
46 #include "chrome/browser/tab_contents/tab_contents.h" 46 #include "chrome/browser/tab_contents/tab_contents.h"
47 #include "chrome/browser/tab_contents/tab_contents_view.h" 47 #include "chrome/browser/tab_contents/tab_contents_view.h"
48 #include "chrome/browser/tabs/pinned_tab_codec.h" 48 #include "chrome/browser/tabs/pinned_tab_codec.h"
49 #include "chrome/common/chrome_constants.h" 49 #include "chrome/common/chrome_constants.h"
50 #include "chrome/common/chrome_paths.h" 50 #include "chrome/common/chrome_paths.h"
(...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after
1077 scoped_refptr<AutomationProviderClass> automation = 1077 scoped_refptr<AutomationProviderClass> automation =
1078 new AutomationProviderClass(profile); 1078 new AutomationProviderClass(profile);
1079 automation->ConnectToChannel(channel_id); 1079 automation->ConnectToChannel(channel_id);
1080 automation->SetExpectedTabCount(expected_tabs); 1080 automation->SetExpectedTabCount(expected_tabs);
1081 1081
1082 AutomationProviderList* list = 1082 AutomationProviderList* list =
1083 g_browser_process->InitAutomationProviderList(); 1083 g_browser_process->InitAutomationProviderList();
1084 DCHECK(list); 1084 DCHECK(list);
1085 list->AddProvider(automation); 1085 list->AddProvider(automation);
1086 } 1086 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_child_process_host.cc ('k') | chrome/browser/browser_main.cc » ('j') | chrome/chrome_browser.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698