chrome/browser/renderer_host/render_widget_host_view_views.h - Issue 7850026: Aura under Linux

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_views.h

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: White spaces Created 9 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 | Annotate | Revision Log

« chrome/browser/process_singleton.h ('K') | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/renderer_host/render_widget_host_view_views.cc » ('j') | chrome/browser/screensaver_window_finder_linux.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_	5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_

6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_	6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_

7 #pragma once	7 #pragma once

8	8

9 #include <map>	9 #include <map>

10 #include <string>	10 #include <string>

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 virtual void Destroy() OVERRIDE;	84 virtual void Destroy() OVERRIDE;

85 virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE;	85 virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE;

86 virtual void SelectionChanged(const std::string& text,	86 virtual void SelectionChanged(const std::string& text,

87 const ui::Range& range,	87 const ui::Range& range,

88 const gfx::Point& start,	88 const gfx::Point& start,

89 const gfx::Point& end) OVERRIDE;	89 const gfx::Point& end) OVERRIDE;

90 virtual void ShowingContextMenu(bool showing) OVERRIDE;	90 virtual void ShowingContextMenu(bool showing) OVERRIDE;

91 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;	91 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;

92 virtual void SetBackground(const SkBitmap& background) OVERRIDE;	92 virtual void SetBackground(const SkBitmap& background) OVERRIDE;

93 #if defined(OS_POSIX)	93 #if defined(OS_POSIX)

	94 virtual void GetDefaultScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
	oshima 2011/09/19 15:55:48 Is this necessary? I wonder how this passed clang Is this necessary? I wonder how this passed clang build... Emmanuel Saint-loubert-Bié 2011/09/19 20:15:36 No it did not pass Clang. I had to fix that with a No it did not pass Clang. I had to fix that with a subsequent query. Should I remove this method altogether?
94 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;	95 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;

95 virtual gfx::Rect GetRootWindowBounds() OVERRIDE;	96 virtual gfx::Rect GetRootWindowBounds() OVERRIDE;

96 #endif	97 #endif

97 #if defined(TOOLKIT_USES_GTK)	98 #if defined(TOOLKIT_USES_GTK)

98 virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE;	99 virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE;

99 virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE;	100 virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE;

100 #endif	101 #endif

101 virtual void SetVisuallyDeemphasized(const SkColor* color,	102 virtual void SetVisuallyDeemphasized(const SkColor* color,

102 bool animate) OVERRIDE;	103 bool animate) OVERRIDE;

103 virtual void UnhandledWheelEvent(	104 virtual void UnhandledWheelEvent(

(...skipping 186 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
290 NotificationRegistrar registrar_;	291 NotificationRegistrar registrar_;

291 gfx::Rect keyboard_rect_;	292 gfx::Rect keyboard_rect_;

292 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> >	293 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> >

293 accelerated_surface_containers_;	294 accelerated_surface_containers_;

294 #endif	295 #endif

295	296

296 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews);	297 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews);

297 };	298 };

298	299

299 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_	300 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_

OLD	NEW