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

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

Issue 9372027: Revert 121236 - Support sharing of ContentMain and BrowserMain code with embedded use cases (try ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chrome_browser_main.h ('k') | chrome/test/base/chrome_test_launcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 void ChromeBrowserMainParts::ToolkitInitialized() { 1102 void ChromeBrowserMainParts::ToolkitInitialized() {
1103 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1103 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1104 chrome_extra_parts_[i]->ToolkitInitialized(); 1104 chrome_extra_parts_[i]->ToolkitInitialized();
1105 } 1105 }
1106 1106
1107 void ChromeBrowserMainParts::PreMainMessageLoopStart() { 1107 void ChromeBrowserMainParts::PreMainMessageLoopStart() {
1108 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1108 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1109 chrome_extra_parts_[i]->PreMainMessageLoopStart(); 1109 chrome_extra_parts_[i]->PreMainMessageLoopStart();
1110 } 1110 }
1111 1111
1112 MessageLoop* ChromeBrowserMainParts::GetMainMessageLoop() {
1113 return NULL;
1114 }
1115
1116 void ChromeBrowserMainParts::PostMainMessageLoopStart() { 1112 void ChromeBrowserMainParts::PostMainMessageLoopStart() {
1117 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1113 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1118 chrome_extra_parts_[i]->PostMainMessageLoopStart(); 1114 chrome_extra_parts_[i]->PostMainMessageLoopStart();
1119 } 1115 }
1120 1116
1121 int ChromeBrowserMainParts::PreCreateThreads() { 1117 int ChromeBrowserMainParts::PreCreateThreads() {
1122 result_code_ = PreCreateThreadsImpl(); 1118 result_code_ = PreCreateThreadsImpl();
1123 // These members must be initialized before returning from this function. 1119 // These members must be initialized before returning from this function.
1124 DCHECK(master_prefs_.get()); 1120 DCHECK(master_prefs_.get());
1125 DCHECK(browser_init_.get()); 1121 DCHECK(browser_init_.get());
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
1944 if (base::win::GetVersion() <= base::win::VERSION_XP) 1940 if (base::win::GetVersion() <= base::win::VERSION_XP)
1945 uma_name += "_XP"; 1941 uma_name += "_XP";
1946 1942
1947 uma_name += "_PreRead_"; 1943 uma_name += "_PreRead_";
1948 uma_name += pre_read_percentage; 1944 uma_name += pre_read_percentage;
1949 AddPreReadHistogramTime(uma_name.c_str(), time); 1945 AddPreReadHistogramTime(uma_name.c_str(), time);
1950 } 1946 }
1951 #endif 1947 #endif
1952 #endif 1948 #endif
1953 } 1949 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.h ('k') | chrome/test/base/chrome_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698