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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 10837154: Mac HiDPI: Fix scale factor on external display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <list> 9 #include <list>
10 10
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // Whether the previous mouse event was ignored due to hitTest check. 128 // Whether the previous mouse event was ignored due to hitTest check.
129 BOOL mouseEventWasIgnored_; 129 BOOL mouseEventWasIgnored_;
130 130
131 // Event monitor for gesture-end events. 131 // Event monitor for gesture-end events.
132 id endGestureMonitor_; 132 id endGestureMonitor_;
133 133
134 // OpenGL Support: 134 // OpenGL Support:
135 135
136 // recursive globalFrameDidChange protection: 136 // recursive globalFrameDidChange protection:
137 BOOL handlingGlobalFrameDidChange_; 137 BOOL handlingGlobalFrameDidChange_;
138
139 // The scale factor of the display this view is in.
140 float deviceScaleFactor_;
138 } 141 }
139 142
140 @property(nonatomic, readonly) NSRange selectedRange; 143 @property(nonatomic, readonly) NSRange selectedRange;
141 144
142 - (void)setCanBeKeyView:(BOOL)can; 145 - (void)setCanBeKeyView:(BOOL)can;
143 - (void)setTakesFocusOnlyOnMouseDown:(BOOL)b; 146 - (void)setTakesFocusOnlyOnMouseDown:(BOOL)b;
144 - (void)setCloseOnDeactivate:(BOOL)b; 147 - (void)setCloseOnDeactivate:(BOOL)b;
145 - (void)setToolTipAtMousePoint:(NSString *)string; 148 - (void)setToolTipAtMousePoint:(NSString *)string;
146 // True for always-on-top special windows (e.g. Balloons and Panels). 149 // True for always-on-top special windows (e.g. Balloons and Panels).
147 - (BOOL)acceptsMouseEventsWhenInactive; 150 - (BOOL)acceptsMouseEventsWhenInactive;
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 463
461 // The current caret bounds. 464 // The current caret bounds.
462 gfx::Rect caret_rect_; 465 gfx::Rect caret_rect_;
463 466
464 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 467 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
465 }; 468 };
466 469
467 } // namespace content 470 } // namespace content
468 471
469 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 472 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698