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

Issue 507363002: MacViews: Guard Objective-C bits in content::WebContentsViewDelegate with __OBJC__ (Closed)

Created:
6 years, 3 months ago by tapted
Modified:
6 years, 3 months ago
CC:
chromium-reviews, darin-cc_chromium.org, jam, android-webview-reviews_chromium.org, jochen+watch_chromium.org, chrome-apps-syd-reviews_chromium.org, mac-views-reviews_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

MacViews: Guard Objective-C bits in content::WebContentsViewDelegate with __OBJC__ Currently WebContentsViewDelegate has a mix of ObjectiveC and C++ code guarded by #ifdef OS_MACOSX. This means, on Mac, it can only be included in .mm files. For views on Mac, we want to reuse the toolkit-views WCVD (and tests) when hosting a WebContents in a views::Widget. So we can't convert everything to .mm. This CL changes the guards to use __OBJC__ and ensures the vtable is a consistent size with the compile flags used on MacViews. To reduce churn, the WCVD methods are given default implementations. MacViews needs the other methods, currently guarded by USE_AURA, so things get really complex without this. BUG=399191 Committed: https://crrev.com/1914f8eaacd794447cb5e35d4e6628b9761b9ebe Cr-Commit-Position: refs/heads/master@{#292349}

Patch Set 1 #

Patch Set 2 : just changes for the first pass #

Patch Set 3 : fix compile, comment #

Patch Set 4 : fix content_browsertests #

Total comments: 1

Patch Set 5 : OS_MACOSX -> __OBJC__ + void* #

Unified diffs Side-by-side diffs Delta from patch set Stats (+68 lines, -72 lines) Patch
M android_webview/native/aw_web_contents_view_delegate.h View 1 chunk +1 line, -1 line 0 comments Download
M athena/content/web_contents_view_delegate_factory_impl.cc View 1 chunk +0 lines, -4 lines 0 comments Download
M content/content_browser.gypi View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M content/public/browser/web_contents_view_delegate.h View 1 2 3 4 3 chunks +22 lines, -24 lines 0 comments Download
A content/public/browser/web_contents_view_delegate.cc View 1 2 3 4 1 chunk +44 lines, -0 lines 0 comments Download
M content/shell/browser/shell_web_contents_view_delegate.h View 1 chunk +0 lines, -9 lines 0 comments Download
M content/shell/browser/shell_web_contents_view_delegate_android.cc View 1 chunk +0 lines, -4 lines 0 comments Download
M content/shell/browser/shell_web_contents_view_delegate_mac.mm View 1 chunk +0 lines, -10 lines 0 comments Download
M content/shell/browser/shell_web_contents_view_delegate_win.cc View 1 chunk +0 lines, -20 lines 0 comments Download

Messages

Total messages: 16 (0 generated)
tapted
tapted@chromium.org changed reviewers: + avi@chromium.org
6 years, 3 months ago (2014-08-27 14:09:10 UTC) #1
tapted
Hi Avi, could you please take a look? (If you want to peek at what's ...
6 years, 3 months ago (2014-08-27 14:09:10 UTC) #2
Avi (use Gerrit)
We have hit this problem many times before, and the way we've always solved it ...
6 years, 3 months ago (2014-08-27 14:57:37 UTC) #3
tapted
PTAL On 2014/08/27 14:57:37, Avi wrote: > We have hit this problem many times before, ...
6 years, 3 months ago (2014-08-28 01:50:59 UTC) #4
Avi (use Gerrit)
Hey, "rules" like the ODR are meant to be broken :)
6 years, 3 months ago (2014-08-28 03:33:32 UTC) #5
Avi (use Gerrit)
Whoo! LGTM
6 years, 3 months ago (2014-08-28 03:34:44 UTC) #6
tapted
tapted@chromium.org changed reviewers: + boliu@chromium.org, oshima@chromium.org
6 years, 3 months ago (2014-08-28 03:48:29 UTC) #7
tapted
+oshima for OWNERS in athena/content +boliu for TBR for android_webview (just a header change for ...
6 years, 3 months ago (2014-08-28 03:48:29 UTC) #8
boliu
On 2014/08/28 03:48:29, tapted wrote: > +oshima for OWNERS in athena/content > +boliu for TBR ...
6 years, 3 months ago (2014-08-28 03:53:44 UTC) #9
oshima
athena/ lgtm
6 years, 3 months ago (2014-08-28 06:38:27 UTC) #10
tapted
thanks all! (-TBR :)
6 years, 3 months ago (2014-08-28 07:12:19 UTC) #11
tapted
The CQ bit was checked by tapted@chromium.org
6 years, 3 months ago (2014-08-28 07:12:40 UTC) #12
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/tapted@chromium.org/507363002/70001
6 years, 3 months ago (2014-08-28 07:13:54 UTC) #13
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: win8_chromium_rel on tryserver.chromium.win ...
6 years, 3 months ago (2014-08-28 07:51:00 UTC) #14
commit-bot: I haz the power
Committed patchset #5 (id:70001) as 1d0c3139888700a30a24b2f529a7bbb50a6ef995
6 years, 3 months ago (2014-08-28 08:26:04 UTC) #15
commit-bot: I haz the power
6 years, 3 months ago (2014-09-10 02:58:30 UTC) #16
Message was sent while issue was closed.
Patchset 5 (id:??) landed as
https://crrev.com/1914f8eaacd794447cb5e35d4e6628b9761b9ebe
Cr-Commit-Position: refs/heads/master@{#292349}

Powered by Google App Engine
This is Rietveld 408576698