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

Side by Side Diff: content/browser/web_contents/web_contents_view_mac.h

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // our lifetime. This doesn't need to be the case, but is this way currently 68 // our lifetime. This doesn't need to be the case, but is this way currently
69 // because that's what was easiest when they were split. 69 // because that's what was easiest when they were split.
70 WebContentsViewMac(WebContentsImpl* web_contents, 70 WebContentsViewMac(WebContentsImpl* web_contents,
71 WebContentsViewDelegate* delegate); 71 WebContentsViewDelegate* delegate);
72 ~WebContentsViewMac() override; 72 ~WebContentsViewMac() override;
73 73
74 // WebContentsView implementation -------------------------------------------- 74 // WebContentsView implementation --------------------------------------------
75 gfx::NativeView GetNativeView() const override; 75 gfx::NativeView GetNativeView() const override;
76 gfx::NativeView GetContentNativeView() const override; 76 gfx::NativeView GetContentNativeView() const override;
77 gfx::NativeWindow GetTopLevelNativeWindow() const override; 77 gfx::NativeWindow GetTopLevelNativeWindow() const override;
78 void GetScreenInfo(blink::WebScreenInfo* web_screen_info) const override; 78 void GetScreenInfo(ScreenInfo* screen_info) const override;
79 void GetContainerBounds(gfx::Rect* out) const override; 79 void GetContainerBounds(gfx::Rect* out) const override;
80 void SizeContents(const gfx::Size& size) override; 80 void SizeContents(const gfx::Size& size) override;
81 void Focus() override; 81 void Focus() override;
82 void SetInitialFocus() override; 82 void SetInitialFocus() override;
83 void StoreFocus() override; 83 void StoreFocus() override;
84 void RestoreFocus() override; 84 void RestoreFocus() override;
85 DropData* GetDropData() const override; 85 DropData* GetDropData() const override;
86 gfx::Rect GetViewBounds() const override; 86 gfx::Rect GetViewBounds() const override;
87 void SetAllowOtherViews(bool allow) override; 87 void SetAllowOtherViews(bool allow) override;
88 bool GetAllowOtherViews() const override; 88 bool GetAllowOtherViews() const override;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 bool allow_other_views_; 151 bool allow_other_views_;
152 152
153 std::unique_ptr<PopupMenuHelper> popup_menu_helper_; 153 std::unique_ptr<PopupMenuHelper> popup_menu_helper_;
154 154
155 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac); 155 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac);
156 }; 156 };
157 157
158 } // namespace content 158 } // namespace content
159 159
160 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 160 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698