Revert 108276 - Revert 108206 - Share TabFirstRenderWatcher with HtmlDialogView.
- Move TabFirstRenderWatcher out of chromeos and combine the logic with HTMLDialgoView.
- Update HtmlDialogBrowserTest.TestStateTransition and move state transition test into TabFirstRenderWatcherTest.TestStateTransition;
- HtmlDialogBrowserTest.TestStateTransition -> WebContentRendered as it only tests OnTabMainFrameFirstRender is callled now;
- Conslidate two TestHtmlDialogUIDelegate into one;
Will share it with the auro app list window to avoid initial jankiness.
BUG=98308,86059
TEST=Hold until all app list changes are in.
Review URL: http://codereview.chromium.org/8417005
[email protected]
Review URL: http://codereview.chromium.org/8351070
[email protected]
Review URL: http://codereview.chromium.org/8437052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108288 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index fe945f2..28c03f9 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -812,8 +812,6 @@
'browser/chromeos/system_key_event_listener.h',
'browser/chromeos/tab_closeable_state_watcher.cc',
'browser/chromeos/tab_closeable_state_watcher.h',
- 'browser/chromeos/tab_first_render_watcher.cc',
- 'browser/chromeos/tab_first_render_watcher.h',
'browser/chromeos/upgrade_detector_chromeos.cc',
'browser/chromeos/upgrade_detector_chromeos.h',
'browser/chromeos/user_cros_settings_provider.cc',
@@ -2296,6 +2294,8 @@
'browser/sync/sync_ui_util_mac.mm',
'browser/tab_closeable_state_watcher.cc',
'browser/tab_closeable_state_watcher.h',
+ 'browser/tab_first_render_watcher.cc',
+ 'browser/tab_first_render_watcher.h',
'browser/tab_contents/background_contents.cc',
'browser/tab_contents/background_contents.h',
'browser/tab_contents/chrome_interstitial_page.cc',
