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

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

Issue 2965015: Attempt four at landing the "histogram.h removed from message_loop.h" patch. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: win build fixes Created 10 years, 5 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/autocomplete/search_provider.h ('k') | chrome/browser/cancelable_request.h » ('j') | no next file with comments »
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"
11 #include "base/env_var.h" 11 #include "base/env_var.h"
12 #include "base/event_recorder.h" 12 #include "base/event_recorder.h"
13 #include "base/histogram.h"
13 #include "base/path_service.h" 14 #include "base/path_service.h"
14 #include "base/scoped_ptr.h" 15 #include "base/scoped_ptr.h"
15 #include "chrome/browser/automation/automation_provider.h" 16 #include "chrome/browser/automation/automation_provider.h"
16 #include "chrome/browser/automation/chrome_frame_automation_provider.h" 17 #include "chrome/browser/automation/chrome_frame_automation_provider.h"
17 #include "chrome/browser/browser_list.h" 18 #include "chrome/browser/browser_list.h"
18 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/browser_window.h" 20 #include "chrome/browser/browser_window.h"
20 #include "chrome/browser/child_process_security_policy.h" 21 #include "chrome/browser/child_process_security_policy.h"
21 #include "chrome/browser/chrome_thread.h" 22 #include "chrome/browser/chrome_thread.h"
22 #include "chrome/browser/defaults.h" 23 #include "chrome/browser/defaults.h"
(...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 scoped_refptr<AutomationProviderClass> automation = 1064 scoped_refptr<AutomationProviderClass> automation =
1064 new AutomationProviderClass(profile); 1065 new AutomationProviderClass(profile);
1065 automation->ConnectToChannel(channel_id); 1066 automation->ConnectToChannel(channel_id);
1066 automation->SetExpectedTabCount(expected_tabs); 1067 automation->SetExpectedTabCount(expected_tabs);
1067 1068
1068 AutomationProviderList* list = 1069 AutomationProviderList* list =
1069 g_browser_process->InitAutomationProviderList(); 1070 g_browser_process->InitAutomationProviderList();
1070 DCHECK(list); 1071 DCHECK(list);
1071 list->AddProvider(automation); 1072 list->AddProvider(automation);
1072 } 1073 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/search_provider.h ('k') | chrome/browser/cancelable_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698