diff options
| author | Daniel Xie <dxie@google.com> | 2015-03-04 13:02:33 -0800 |
|---|---|---|
| committer | Daniel Xie <dxie@google.com> | 2015-03-04 21:03:32 +0000 |
| commit | a1467c88087c32591482ab9dce41aa031320632a (patch) | |
| tree | a59143c2c109fdc2929d43e087534ca7748c659a /components/web_modal | |
| parent | b095035967dc046a3144c7219cbbb5fca7afcd15 (diff) | |
| download | chromium_src-a1467c88087c32591482ab9dce41aa031320632a.zip chromium_src-a1467c88087c32591482ab9dce41aa031320632a.tar.gz chromium_src-a1467c88087c32591482ab9dce41aa031320632a.tar.bz2 | |
Revert "Revert "MacViews: Unify web contents modal dialog types""
This reverts commit d87b783639782496ff2f5826a226df6519a3595f.
Merge branch 'master' of https://chromium.googlesource.com/a/chromium/src
Revert "MacViews: Unify web contents modal dialog types"
speculatively reverting this to solve browser CPM
BUG=463776
This reverts commit 5f1263bb318f072343f59dec4b310a522c80b9a2.
Merge branch 'master' of https://chromium.googlesource.com/a/chromium/src
Revert "Handle unsucessful JsonPrefStore initialization in SupervisedUserSettingsService."
this may be casuing an increase in rendererexit code.
BUG=463646
This reverts commit 0197d5dfe8b8105b0263dbe80f6079020a6ccf5d.
Merge branch 'master' of https://chromium.googlesource.com/a/chromium/src
This is causing a huge amounts of renderer crashes because of RESULT_CODE_KILLED_BAD_MESSAGE. Reverting this from master.
Revert "<webview>: Removed ResolveURL"
This reverts commit c2fc6144ed227bf2d6bc7791c910a2d4f3c58418.
Cr-Commit-Position: refs/heads/master@{#319124}
Diffstat (limited to 'components/web_modal')
| -rw-r--r-- | components/web_modal/native_web_contents_modal_dialog.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/components/web_modal/native_web_contents_modal_dialog.h b/components/web_modal/native_web_contents_modal_dialog.h index 4bb956a..ef459b1 100644 --- a/components/web_modal/native_web_contents_modal_dialog.h +++ b/components/web_modal/native_web_contents_modal_dialog.h @@ -11,21 +11,8 @@ namespace web_modal { // TODO(gbillock): rename this file -#if defined(OS_MACOSX) -// Use a void* since none of the gfx::Native* types are suitable for -// representing the web contents modal dialog under Cocoa. -typedef void* NativeWebContentsModalDialog; -#else -typedef gfx::NativeView NativeWebContentsModalDialog; -#endif - -#if defined(OS_MACOSX) -// Use a void* since none of the gfx::Native* types are suitable for -// representing a popup window under Cocoa. -typedef void* NativePopup; -#else -typedef gfx::NativeView NativePopup; -#endif +using NativeWebContentsModalDialog = gfx::NativeWindow; +using NativePopup = gfx::NativeWindow; } // namespace web_modal |