diff options
| author | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 01:09:32 +0000 |
|---|---|---|
| committer | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 01:09:32 +0000 |
| commit | 01fb95b03e0254d5006daec42b9a429eb650bfc0 (patch) | |
| tree | a4927fec2eeea47a38663bcca3a778d928b6a734 /apps/apps.gypi | |
| parent | f234673808cba003edf4d74d57a0e77899d4ff48 (diff) | |
| download | chromium_src-01fb95b03e0254d5006daec42b9a429eb650bfc0.zip chromium_src-01fb95b03e0254d5006daec42b9a429eb650bfc0.tar.gz chromium_src-01fb95b03e0254d5006daec42b9a429eb650bfc0.tar.bz2 | |
Remove references to WebContentsView::SizeContents from chrome/ and app/
WebContentsView::SizeContents was initially introduced as a hack to allow the
content module to resize a WebContentsView. This is odd because the embedder
should be in full control of the layout of the WebContentsView. Unfortunately,
SizeContents started being used as a platform-agnostic way for the embedder to
change the size of a WebContentsView.
The mac implementation of SizeContents has never been correct. The
implementation would work correctly when SizeContents was used by the embedder,
but it did not work when used by the content module. See
https://code.google.com/p/chromium/issues/detail?id=264207 for details. I
changed the mac implementation of SizeContents to be a no-op, which fixed the
use of SizeContents from the content module, and broke its usage from the
embedder.
This CL introduces a new platform agnostic utility method to resize a
WebContents. I've replaced all calls to SizeContents from chrome/ and app/ with
a call to the new utility method. There is no expected behavioral change on
aura, gtk, or android. This should fix the problems that have arisen from my
change to the mac implementation of SizeContents.
Ideally, the utility method would take a gfx::NativeView as its parameter.
Unfortunately, I was unable perform the resizing on a ui::AndroidView*, and I
was forced to pass in the whole WebContents to mimic the behavior of
WebContentsViewAndroid::SizeContents.
BUG=354769
TEST=Follow steps listed in bug.
Review URL: https://codereview.chromium.org/209023003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/apps.gypi')
| -rw-r--r-- | apps/apps.gypi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi index 998f7e4..25611b0 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -72,8 +72,18 @@ 'ui/views/app_window_frame_view.h', 'ui/views/native_app_window_views.cc', 'ui/views/native_app_window_views.h', + 'ui/web_contents_sizer.h', ], 'conditions': [ + ['OS=="mac"', { + 'sources': [ + 'ui/web_contents_sizer.mm', + ], + }, { # OS!=mac + 'sources': [ + 'ui/web_contents_sizer.cc', + ], + }], ['chromeos==1', { 'dependencies': [ |