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

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed)

Created:
7 years, 11 months ago by Elliot Glaysher
Modified:
7 years, 11 months ago
CC:
chromium-reviews, ben+watch_chromium.org, tfarina, jam, joi+watch-content_chromium.org, darin-cc_chromium.org, jochen+watch_chromium.org
Visibility:
Public.

Description

Finally rip the global StackingClient bandaid off. - Removes the aura::client::SetStackingClient(StackingClient*) interface. - Moves the ash StackingController from a singleton owned by ash::Shell to one StackingController per RootWindow owned by the ash::RootWindowController. (Also removes a spurious delegate method, where every implementation creates the same object, including tests.) - Removes the global DesktopStackingClient and related interfaces. - Fix the ChromeViewsDelegate so that it still sets context in chromeos builds. - Rename content::ShellStackingClientAsh to content::MinimalAsh to reflect what it really does. In addition, the following fix ups apply: - Previously, WebContentsViewAura asserted that it needed a context window. Now if no context window is provided, it isn't added to an aura hierarchy. There are times when that context doesn't exist: various chromeos dialogs that directly invoke WebView and toplevel extension/app windows that are created from background pages that don't have contexts. - Because of that, added a few of NULL checking to RenderWidgetHostViewAura. (Other methods NULL checked Window::GetRootWindow(), but there were a few that didn't and relied on the old NULL means lookup in the StackingClient behaviour.) BUG=161882 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=177182 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=178083

Patch Set 1 #

Patch Set 2 : Make ChromeViewsDelegate also set context in chromeos #

Patch Set 3 : Theoretical fix for the final browser_tests crash in chromeos. #

Patch Set 4 : omg, its gone. lets see what the trybots say. #

Patch Set 5 : Rebase to pick up the trybot fixes #

Patch Set 6 : Fix compile errors. #

Patch Set 7 : Try making context optional in WebContentsViewAura. #

Patch Set 8 : Switch the timing of when MinimalAsh is built. #

Patch Set 9 : Hopefully the last part where a NULL parent is passed. #

Patch Set 10 : OK, rebase #

Patch Set 11 : Theoretical fix for javascript modal dialogs. #

Patch Set 12 : Patch cleanup #

Total comments: 1

Patch Set 13 : Fix SimpleMessageBoxViews asan failure. #

Total comments: 6

Patch Set 14 : Rebase to ToT #

Patch Set 15 : Rebased to ToT #

Patch Set 16 : Maybe this will fix the patch. #

Patch Set 17 : Patch all the places where we used an unprotected RootWindow. #

Patch Set 18 : Solve this mostly at the content layer? #

Patch Set 19 : Stupid windows + executable bit. #

Patch Set 20 : And fix the final ExtensionApiTest.AlertBasic case. #

Total comments: 2

Patch Set 21 : Rebase to ToT #

Patch Set 22 : Rebase to ToT #

Unified diffs Side-by-side diffs Delta from patch set Stats (+233 lines, -513 lines) Patch
M ash/root_window_controller.h View 1 2 3 4 2 chunks +3 lines, -0 lines 0 comments Download
M ash/root_window_controller.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2 chunks +4 lines, -0 lines 0 comments Download
M ash/shell.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 3 chunks +0 lines, -4 lines 0 comments Download
M ash/shell.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 4 chunks +0 lines, -9 lines 0 comments Download
M ash/shell/shell_delegate_impl.h View 1 2 3 4 1 chunk +0 lines, -1 line 0 comments Download
M ash/shell/shell_delegate_impl.cc View 1 2 3 4 2 chunks +0 lines, -5 lines 0 comments Download
M ash/shell_delegate.h View 1 2 3 4 2 chunks +0 lines, -4 lines 0 comments Download
M ash/test/test_shell_delegate.h View 1 2 3 4 1 chunk +0 lines, -1 line 0 comments Download
M ash/test/test_shell_delegate.cc View 1 2 3 4 2 chunks +0 lines, -5 lines 0 comments Download
M chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc View 1 2 3 4 5 6 7 8 9 10 2 chunks +11 lines, -0 lines 0 comments Download
M chrome/browser/ui/ash/chrome_shell_delegate.h View 1 2 3 4 1 chunk +0 lines, -1 line 0 comments Download
M chrome/browser/ui/ash/chrome_shell_delegate.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 2 chunks +0 lines, -5 lines 0 comments Download
M chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h View 1 2 3 2 chunks +0 lines, -7 lines 0 comments Download
M chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc View 1 2 3 3 chunks +0 lines, -5 lines 0 comments Download
D chrome/browser/ui/aura/stacking_client_aura.h View 1 2 3 1 chunk +0 lines, -42 lines 0 comments Download
D chrome/browser/ui/aura/stacking_client_aura.cc View 1 2 3 1 chunk +0 lines, -33 lines 0 comments Download
M chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc View 1 2 3 1 chunk +0 lines, -1 line 0 comments Download
M chrome/browser/ui/views/chrome_views_delegate.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 2 chunks +10 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/chrome_web_dialog_view.cc View 1 2 1 chunk +15 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/javascript_app_modal_dialog_views.cc View 1 2 3 4 5 6 7 8 1 chunk +4 lines, -1 line 0 comments Download
M chrome/browser/ui/views/simple_message_box_views.cc View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +4 lines, -1 line 0 comments Download
M chrome/chrome_browser_ui.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 1 chunk +0 lines, -2 lines 0 comments Download
M content/browser/renderer_host/render_widget_host_view_aura.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 6 chunks +34 lines, -20 lines 0 comments Download
M content/browser/web_contents/web_contents_view_aura.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 1 chunk +12 lines, -4 lines 0 comments Download
M content/content_shell.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 2 chunks +2 lines, -2 lines 0 comments Download
A + content/shell/minimal_ash.h View 1 2 3 3 chunks +7 lines, -7 lines 0 comments Download
A content/shell/minimal_ash.cc View 1 2 3 1 chunk +53 lines, -0 lines 0 comments Download
M content/shell/shell.h View 1 2 3 3 chunks +8 lines, -7 lines 0 comments Download
M content/shell/shell_aura.cc View 1 2 3 4 5 6 7 4 chunks +18 lines, -9 lines 0 comments Download
D content/shell/shell_stacking_client_ash.h View 1 2 3 1 chunk +0 lines, -66 lines 0 comments Download
D content/shell/shell_stacking_client_ash.cc View 1 2 3 1 chunk +0 lines, -56 lines 0 comments Download
M ui/aura/client/stacking_client.h View 1 2 3 1 chunk +0 lines, -4 lines 0 comments Download
M ui/aura/client/stacking_client.cc View 1 2 3 1 chunk +12 lines, -24 lines 0 comments Download
M ui/aura/demo/demo_main.cc View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M ui/aura/env.h View 1 2 3 3 chunks +0 lines, -7 lines 0 comments Download
M ui/aura/env.cc View 1 2 3 1 chunk +1 line, -2 lines 0 comments Download
M ui/aura/test/test_stacking_client.cc View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M ui/aura/window.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 1 chunk +1 line, -2 lines 0 comments Download
M ui/gfx/screen_win.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 1 chunk +7 lines, -0 lines 0 comments Download
M ui/views/examples/content_client/examples_browser_main_parts.h View 1 2 3 2 chunks +0 lines, -9 lines 0 comments Download
M ui/views/examples/content_client/examples_browser_main_parts.cc View 1 2 3 3 chunks +0 lines, -4 lines 0 comments Download
M ui/views/test/views_test_base.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 2 chunks +4 lines, -4 lines 0 comments Download
M ui/views/view_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 1 chunk +2 lines, -1 line 0 comments Download
M ui/views/views.gyp View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 1 chunk +0 lines, -2 lines 0 comments Download
M ui/views/widget/desktop_aura/desktop_native_widget_aura.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 1 chunk +6 lines, -2 lines 0 comments Download
M ui/views/widget/desktop_aura/desktop_screen_win.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +2 lines, -1 line 0 comments Download
D ui/views/widget/desktop_aura/desktop_stacking_client.h View 1 2 3 1 chunk +0 lines, -65 lines 0 comments Download
D ui/views/widget/desktop_aura/desktop_stacking_client.cc View 1 2 3 1 chunk +0 lines, -64 lines 0 comments Download
M ui/views/widget/native_widget_aura.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +2 lines, -9 lines 0 comments Download
M ui/views/widget/widget.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 2 chunks +7 lines, -6 lines 0 comments Download

Messages

Total messages: 11 (0 generated)
Elliot Glaysher
This is it. This should be the final patch that pulls out the global StackingClient ...
7 years, 11 months ago (2013-01-14 22:56:39 UTC) #1
Elliot Glaysher
https://codereview.chromium.org/11829040/diff/38006/chrome/browser/ui/views/simple_message_box_views.cc File chrome/browser/ui/views/simple_message_box_views.cc (right): https://codereview.chromium.org/11829040/diff/38006/chrome/browser/ui/views/simple_message_box_views.cc#newcode173 chrome/browser/ui/views/simple_message_box_views.cc:173: views::Widget::CreateWindow(dialog)->Show(); This is a common thing that I've found: ...
7 years, 11 months ago (2013-01-14 23:15:19 UTC) #2
Ben Goodger (Google)
lgtm https://codereview.chromium.org/11829040/diff/38006/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc File chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc (right): https://codereview.chromium.org/11829040/diff/38006/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc#newcode89 chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc:89: // When we are part of a WebContents ...
7 years, 11 months ago (2013-01-15 18:19:52 UTC) #3
Elliot Glaysher
https://codereview.chromium.org/11829040/diff/38006/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc File chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc (right): https://codereview.chromium.org/11829040/diff/38006/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc#newcode89 chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc:89: // When we are part of a WebContents that ...
7 years, 11 months ago (2013-01-15 19:27:50 UTC) #4
Ben Goodger (Google)
There's a hidden root window that windows with a NULL parent get added to in ...
7 years, 11 months ago (2013-01-15 19:29:12 UTC) #5
Elliot Glaysher
On 2013/01/15 19:29:12, Ben Goodger (Google) wrote: > There's a hidden root window that windows ...
7 years, 11 months ago (2013-01-15 20:19:55 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/erg@chromium.org/11829040/45048
7 years, 11 months ago (2013-01-15 20:22:21 UTC) #7
Ben Goodger (Google)
ic On Tue, Jan 15, 2013 at 12:19 PM, <erg@chromium.org> wrote: > On 2013/01/15 19:29:12, ...
7 years, 11 months ago (2013-01-15 20:23:15 UTC) #8
commit-bot: I haz the power
Retried try job too often on win7_aura for step(s) interactive_ui_tests, views_unittests
7 years, 11 months ago (2013-01-15 23:03:44 UTC) #9
Elliot Glaysher
Ben: Enough here has changed that I want your OK. The only real differences are ...
7 years, 11 months ago (2013-01-18 20:31:37 UTC) #10
Ben Goodger (Google)
7 years, 11 months ago (2013-01-18 23:10:19 UTC) #11
Message was sent while issue was closed.
lgtm

Powered by Google App Engine
This is Rietveld 408576698