summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_main.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 22:14:25 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 22:14:25 +0000
commitb0f146ff51b2b37a2e3549c875fb42365ded7a21 (patch)
treefc4ee794e7feacbc3d73dfb763b5a90bb11f1041 /content/browser/browser_main.cc
parent190efec7b7523f42c0f7e9a5ad80c79c3f68a7d1 (diff)
downloadchromium_src-b0f146ff51b2b37a2e3549c875fb42365ded7a21.zip
chromium_src-b0f146ff51b2b37a2e3549c875fb42365ded7a21.tar.gz
chromium_src-b0f146ff51b2b37a2e3549c875fb42365ded7a21.tar.bz2
Create a very simple TabContentsView (and not fully implemented yet) and add more supporting code to be able to load a page. Right now it's not rendering, but I suspect it's something small, and the patch has gotten large so I figure it's time to send it for review.
BUG=90445 Review URL: http://codereview.chromium.org/7906008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main.cc')
-rw-r--r--content/browser/browser_main.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc
index cd5fe0a..639e901 100644
--- a/content/browser/browser_main.cc
+++ b/content/browser/browser_main.cc
@@ -17,6 +17,7 @@
#include "content/common/content_switches.h"
#include "content/common/hi_res_timer_manager.h"
#include "content/common/main_function_params.h"
+#include "content/common/notification_service.h"
#include "content/common/result_codes.h"
#include "content/common/sandbox_policy.h"
#include "crypto/nss_util.h"
@@ -346,6 +347,8 @@ void BrowserMainParts::ToolkitInitialized() {
int BrowserMain(const MainFunctionParams& parameters) {
TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, "");
+ NotificationService main_notification_service;
+
scoped_ptr<content::BrowserMainParts> parts(
content::GetContentClient()->browser()->CreateBrowserMainParts(
parameters));
@@ -401,7 +404,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
base::win::ScopedCOMInitializer com_initializer;
#endif // OS_WIN
- // Initialize histogram statistics gathering system.
base::StatisticsRecorder statistics;
parts->RunMainMessageLoopParts();