diff options
| author | sadrul <sadrul@chromium.org> | 2015-11-12 10:41:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-12 18:43:07 +0000 |
| commit | 8b11d2650f933e26dda39f6e8832c986056f5eef (patch) | |
| tree | 69db08385585523d81dd92cc1d6d9252d453880a /content | |
| parent | 5abfd72765d29f36b577cdbb91ed7cfabc7560a7 (diff) | |
| download | chromium_src-8b11d2650f933e26dda39f6e8832c986056f5eef.zip chromium_src-8b11d2650f933e26dda39f6e8832c986056f5eef.tar.gz chromium_src-8b11d2650f933e26dda39f6e8832c986056f5eef.tar.bz2 | |
gfx: Remove gfx::NativeEditView.
There is only one use left for NativeEditView for content-shell on mac. So
remove the NativeEditView typedef on all platforms, and instead explicitly use
NSTextField for content-shell on mac.
BUG=500004
Review URL: https://codereview.chromium.org/1440683003
Cr-Commit-Position: refs/heads/master@{#359337}
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/browser/shell.cc | 2 | ||||
| -rw-r--r-- | content/shell/browser/shell.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc index 0e8b8b7..b50eb09 100644 --- a/content/shell/browser/shell.cc +++ b/content/shell/browser/shell.cc @@ -68,7 +68,9 @@ Shell::Shell(WebContents* web_contents) devtools_frontend_(NULL), is_fullscreen_(false), window_(NULL), +#if defined(OS_MACOSX) url_edit_view_(NULL), +#endif headless_(false) { const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h index 05ec79e..9ef5be2 100644 --- a/content/shell/browser/shell.h +++ b/content/shell/browser/shell.h @@ -225,7 +225,9 @@ class Shell : public WebContentsDelegate, bool is_fullscreen_; gfx::NativeWindow window_; - gfx::NativeEditView url_edit_view_; +#if defined(OS_MACOSX) + NSTextField* url_edit_view_; +#endif gfx::Size content_size_; |