|
Revert 110710 - Add ChromeBrowserMainExtraParts for non main parts.
Revert 110741 - Fix ProcessSingletonTest.StartupRaceCondition for win.
This was originally submitted as http://codereview.chromium.org/8539038/ which was reverted because of a failing test on win.
This reverts the code back to a single instance of BrowserMainParts, with auxillary parts (Gtk, Views, Aura, Touch) implemented from a new base class, ChromeBrowserParts, which has a Chrome specific interface, allowing initialization to be better subdivided.
This should fix the notifications auto tests.
This CL also addresses the test failure on win (and a test failure on linux_chromeos triggered by the windows fix).
BUG= 103821
TEST=Make sure all tests and autotests run
TBR=stevenjb@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=110753
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+377 lines, -559 lines) |
Patch |
 |
M |
chrome/browser/chrome_browser_main.h
|
View
|
|
7 chunks |
+13 lines, -23 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/chrome_browser_main.cc
|
View
|
|
10 chunks |
+32 lines, -45 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/chrome_browser_main_extra_parts.h
|
View
|
|
1 chunk |
+0 lines, -44 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/chrome_browser_main_extra_parts.cc
|
View
|
|
1 chunk |
+0 lines, -38 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/chrome_browser_main_extra_parts_aura.h
|
View
|
|
1 chunk |
+0 lines, -22 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/chrome_browser_main_extra_parts_aura.cc
|
View
|
|
1 chunk |
+0 lines, -26 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/chrome_browser_main_extra_parts_gtk.h
|
View
|
|
1 chunk |
+0 lines, -26 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/chrome_browser_main_extra_parts_gtk.cc
|
View
|
|
1 chunk |
+0 lines, -80 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/chrome_browser_main_extra_parts_touch.h
|
View
|
|
1 chunk |
+0 lines, -22 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/chrome_browser_main_extra_parts_touch.cc
|
View
|
|
1 chunk |
+0 lines, -16 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/chrome_browser_main_extra_parts_views.h
|
View
|
|
1 chunk |
+0 lines, -22 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/chrome_browser_main_extra_parts_views.cc
|
View
|
|
1 chunk |
+0 lines, -56 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/chrome_browser_main_linux.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/chrome_browser_main_unittest.cc
|
View
|
|
3 chunks |
+19 lines, -11 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/chrome_browser_parts_aura.h
|
View
|
|
1 chunk |
+29 lines, -0 lines |
0 comments
|
Download
|
 |
A + |
chrome/browser/chrome_browser_parts_aura.cc
|
View
|
|
3 chunks |
+26 lines, -4 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/chrome_browser_parts_gtk.h
|
View
|
|
1 chunk |
+33 lines, -0 lines |
0 comments
|
Download
|
 |
A + |
chrome/browser/chrome_browser_parts_gtk.cc
|
View
|
|
3 chunks |
+27 lines, -6 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/chrome_browser_parts_touch.h
|
View
|
|
1 chunk |
+29 lines, -0 lines |
0 comments
|
Download
|
 |
A + |
chrome/browser/chrome_browser_parts_touch.cc
|
View
|
|
1 chunk |
+8 lines, -4 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/chrome_browser_parts_views.h
|
View
|
|
1 chunk |
+28 lines, -0 lines |
0 comments
|
Download
|
 |
A + |
chrome/browser/chrome_browser_parts_views.cc
|
View
|
|
4 chunks |
+9 lines, -5 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/chrome_content_browser_client.h
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/chrome_content_browser_client.cc
|
View
|
|
3 chunks |
+20 lines, -21 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/chromeos/chrome_browser_main_chromeos.h
|
View
|
|
1 chunk |
+1 line, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
View
|
|
3 chunks |
+23 lines, -28 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/notifications/desktop_notification_service_factory.cc
|
View
|
|
1 chunk |
+2 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/chrome_browser.gypi
|
View
|
|
1 chunk |
+8 lines, -10 lines |
0 comments
|
Download
|
 |
M |
chrome/test/functional/PYAUTO_TESTS
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
content/browser/browser_main_loop.h
|
View
|
|
2 chunks |
+6 lines, -1 line |
0 comments
|
Download
|
 |
M |
content/browser/browser_main_loop.cc
|
View
|
|
6 chunks |
+30 lines, -22 lines |
0 comments
|
Download
|
 |
M |
content/browser/mock_content_browser_client.h
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/browser/mock_content_browser_client.cc
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
M |
content/public/browser/browser_main_parts.h
|
View
|
|
3 chunks |
+10 lines, -5 lines |
0 comments
|
Download
|
 |
M |
content/public/browser/content_browser_client.h
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/shell/shell_content_browser_client.h
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/shell/shell_content_browser_client.cc
|
View
|
|
1 chunk |
+4 lines, -3 lines |
0 comments
|
Download
|
Total messages: 2 (0 generated)
|