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

Issue 2087643003: Move web modal dialog manager files into the constrained_window component. (Closed)

Created:
4 years, 6 months ago by Patti Lor
Modified:
4 years, 4 months ago
Reviewers:
tapted, brettw, msw
CC:
chromium-reviews, sdefresne+watchlist_chromium.org, droger+watchlist_chromium.org, tfarina, dzhioev+watch_chromium.org, achuith+watch_chromium.org, oshima+watch_chromium.org, blundell+watchlist_chromium.org, davemoore+watch_chromium.org, chrome-apps-syd-reviews_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Move web modal dialog manager files into the constrained_window component. Currently, the CreateNativeWebModalManager() method declared inside the web_modal component is defined outside of web_modal, which means linking it as a shared component will fail. This is a layering violation. This is now fixed for builds using Views, with constrained_window depending on web_modal and web_modal providing definitions of all the symbols it declares. Most unused implementations of CreateNativeWebModalManager() have been deleted, with two remaining: create_native_web_modal_manager_cocoa.mm for Cocoa, and test_create_native_web_modal_manager_cocoa.cc to prevent errors compiling components_unittests, which isn't allowed to depend on the former file's dependencies. BUG=522654, 492442 Committed: https://crrev.com/7a65925409017abde6fcf3f4213f779707c0ab57 Cr-Commit-Position: refs/heads/master@{#412730}

Patch Set 1 #

Patch Set 2 : Delete unittest function definition and replace with default views one. #

Patch Set 3 : Fix captive_portal_window_proxy.cc #

Patch Set 4 : Speculative fix for duplicate CreateNativeWebModalManager() method. #

Patch Set 5 : More speculative fixes. #

Patch Set 6 : Fix equality mistake with GYP. #

Patch Set 7 : Rebase? #

Total comments: 16

Patch Set 8 : Fix skia deps and address review comments. #

Patch Set 9 : Split out NativeManagerTracker and TestNativeWebContentsModalDialogManager from web_contents_modal_… #

Patch Set 10 : Rebase. #

Patch Set 11 : Rebase for patch failure. #

Patch Set 12 : Separate implementations of ShowModalDialog for MacViews/Views vs Cocoa. #

Patch Set 13 : Optionally declare CreateNativeWebModalManager for Mac. #

Patch Set 14 : Revert NativeManagerTracker split, delete CreateNativeWebModalManager impls w/ two left for Cocoa a… #

Total comments: 8

Patch Set 15 : Fix comments and includes. #

Patch Set 16 : Fix silly mistake passing the wrong WebContents. #

Patch Set 17 : Rebase. #

Total comments: 6

Patch Set 18 : Revert changes to gyp files, IWYU for #ifdef (OS_MACOSX). #

Unified diffs Side-by-side diffs Delta from patch set Stats (+128 lines, -392 lines) Patch
M chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 2 chunks +2 lines, -1 line 0 comments Download
M chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm View 1 2 3 4 5 6 7 2 chunks +4 lines, -12 lines 0 comments Download
M chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +2 lines, -3 lines 0 comments Download
D chrome/browser/ui/views/native_web_contents_modal_dialog_manager_views.h View 1 chunk +0 lines, -76 lines 0 comments Download
D chrome/browser/ui/views/native_web_contents_modal_dialog_manager_views.cc View 1 chunk +0 lines, -220 lines 0 comments Download
D chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc View 1 chunk +0 lines, -19 lines 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 3 chunks +1 line, -4 lines 0 comments Download
M components/constrained_window/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 2 chunks +26 lines, -1 line 0 comments Download
M components/constrained_window/DEPS View 1 chunk +3 lines, -0 lines 0 comments Download
M components/constrained_window/constrained_window_views.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 2 chunks +6 lines, -1 line 0 comments Download
M components/constrained_window/constrained_window_views.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +1 line, -2 lines 0 comments Download
A + components/constrained_window/native_web_contents_modal_dialog_manager_views.h View 1 2 3 4 5 6 7 3 chunks +7 lines, -3 lines 0 comments Download
A + components/constrained_window/native_web_contents_modal_dialog_manager_views.cc View 1 2 3 4 5 6 7 5 chunks +7 lines, -4 lines 0 comments Download
A components/constrained_window/show_modal_dialog_cocoa.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 1 chunk +34 lines, -0 lines 0 comments Download
A components/constrained_window/show_modal_dialog_views.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 1 chunk +27 lines, -0 lines 0 comments Download
A + components/constrained_window/test_create_native_web_modal_manager_cocoa.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 2 chunks +3 lines, -5 lines 0 comments Download
M components/web_modal/web_contents_modal_dialog_manager.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 2 chunks +5 lines, -4 lines 0 comments Download
M components/web_modal/web_contents_modal_dialog_manager.cc View 1 chunk +0 lines, -6 lines 0 comments Download
M components/web_modal/web_contents_modal_dialog_manager_unittest.cc View 1 3 4 9 10 11 12 13 1 chunk +0 lines, -11 lines 0 comments Download
M extensions/extensions_tests.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +0 lines, -1 line 0 comments Download
M extensions/shell/app_shell.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +0 lines, -1 line 0 comments Download
D extensions/shell/browser/shell_web_contents_modal_dialog_manager.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 1 chunk +0 lines, -18 lines 0 comments Download

Dependent Patchsets:

Messages

Total messages: 74 (57 generated)
Patti Lor
Hey Trent, PTAL - this is the constrained_window CL to accompany the certificate viewer stuff ...
4 years, 5 months ago (2016-06-29 00:23:35 UTC) #5
tapted
On 2016/06/29 00:23:35, Patti Lor wrote: > Hey Trent, PTAL - this is the constrained_window ...
4 years, 5 months ago (2016-06-29 02:46:31 UTC) #6
tapted
https://codereview.chromium.org/2087643003/diff/180001/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm File chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm (right): https://codereview.chromium.org/2087643003/diff/180001/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm#newcode44 chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm:44: // constrained_window component is not used in Cocoa code ...
4 years, 5 months ago (2016-06-29 03:02:45 UTC) #7
Patti Lor
Hi Trent, PTAL! There's a consistently failing test in linux_chromium_chromeos_rel_ng ProxyAuthOnUserBoardScreenTest.ProxyAuthDialogOnUserBoardScreen which I can't replicate ...
4 years, 5 months ago (2016-07-13 03:09:41 UTC) #14
tapted
I'm pretty sure the ProxyAuthOnUserBoardScreenTest.ProxyAuthDialogOnUserBoardScreen is a flake Call me over if you get stuck ...
4 years, 5 months ago (2016-07-13 04:36:19 UTC) #15
Patti Lor
Thanks, PTAL. https://codereview.chromium.org/2087643003/diff/180001/components/constrained_window/constrained_window_views.cc File components/constrained_window/constrained_window_views.cc (right): https://codereview.chromium.org/2087643003/diff/180001/components/constrained_window/constrained_window_views.cc#newcode142 components/constrained_window/constrained_window_views.cc:142: web_modal::WebContentsModalDialogManager::CreateNativeWebModalManager( On 2016/07/13 04:36:19, tapted wrote: > ...
4 years, 5 months ago (2016-07-19 07:39:08 UTC) #41
tapted
lgtm % nits and the following: can you start the CL description with a short ...
4 years, 5 months ago (2016-07-19 09:29:41 UTC) #42
Patti Lor
Hi msw, please take a look - this was the constrained_window refactor you asked for ...
4 years, 4 months ago (2016-07-28 01:29:31 UTC) #52
Patti Lor
Sorry, I seem to not have added you - please see the message just before ...
4 years, 4 months ago (2016-07-31 23:55:15 UTC) #54
Patti Lor
Ping @msw? Thanks.
4 years, 4 months ago (2016-08-09 08:05:12 UTC) #55
msw
lgtm
4 years, 4 months ago (2016-08-09 17:41:27 UTC) #56
Patti Lor
Hi brettw@, PTAL for OWNER's review on: chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc components/constrained_window.gypi components/web_modal.gypi & components/web_modal/* extensions/* Thanks very ...
4 years, 4 months ago (2016-08-10 00:20:17 UTC) #58
brettw
rs lgtm https://codereview.chromium.org/2087643003/diff/530001/components/constrained_window.gypi File components/constrained_window.gypi (right): https://codereview.chromium.org/2087643003/diff/530001/components/constrained_window.gypi#newcode1 components/constrained_window.gypi:1: # Copyright 2014 The Chromium Authors. All ...
4 years, 4 months ago (2016-08-17 17:49:55 UTC) #63
Patti Lor
Thanks for the review! https://codereview.chromium.org/2087643003/diff/530001/components/constrained_window.gypi File components/constrained_window.gypi (right): https://codereview.chromium.org/2087643003/diff/530001/components/constrained_window.gypi#newcode1 components/constrained_window.gypi:1: # Copyright 2014 The Chromium ...
4 years, 4 months ago (2016-08-18 03:05:49 UTC) #68
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2087643003/550001
4 years, 4 months ago (2016-08-18 03:06:32 UTC) #71
commit-bot: I haz the power
Committed patchset #18 (id:550001)
4 years, 4 months ago (2016-08-18 03:57:33 UTC) #72
commit-bot: I haz the power
4 years, 4 months ago (2016-08-18 04:01:15 UTC) #74
Message was sent while issue was closed.
Patchset 18 (id:??) landed as
https://crrev.com/7a65925409017abde6fcf3f4213f779707c0ab57
Cr-Commit-Position: refs/heads/master@{#412730}

Powered by Google App Engine
This is Rietveld 408576698