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

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: Merge conflict resolved 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
OLDNEW
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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 virtual void Destroy() OVERRIDE; 81 virtual void Destroy() OVERRIDE;
82 virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE; 82 virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE;
83 virtual void SelectionChanged(const std::string& text, 83 virtual void SelectionChanged(const std::string& text,
84 const ui::Range& range, 84 const ui::Range& range,
85 const gfx::Point& start, 85 const gfx::Point& start,
86 const gfx::Point& end) OVERRIDE; 86 const gfx::Point& end) OVERRIDE;
87 virtual void ShowingContextMenu(bool showing) OVERRIDE; 87 virtual void ShowingContextMenu(bool showing) OVERRIDE;
88 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE; 88 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;
89 virtual void SetBackground(const SkBitmap& background) OVERRIDE; 89 virtual void SetBackground(const SkBitmap& background) OVERRIDE;
90 #if defined(OS_POSIX) 90 #if defined(OS_POSIX)
91 virtual void GetDefaultScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
91 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; 92 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
92 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; 93 virtual gfx::Rect GetRootWindowBounds() OVERRIDE;
93 #endif 94 #endif
94 #if defined(TOOLKIT_USES_GTK) 95 #if defined(TOOLKIT_USES_GTK)
95 virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE; 96 virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE;
96 virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE; 97 virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE;
97 #endif 98 #endif
98 virtual void SetVisuallyDeemphasized(const SkColor* color, 99 virtual void SetVisuallyDeemphasized(const SkColor* color,
99 bool animate) OVERRIDE; 100 bool animate) OVERRIDE;
100 virtual void UnhandledWheelEvent( 101 virtual void UnhandledWheelEvent(
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 280
280 #if defined(TOUCH_UI) 281 #if defined(TOUCH_UI)
281 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> > 282 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> >
282 accelerated_surface_containers_; 283 accelerated_surface_containers_;
283 #endif 284 #endif
284 285
285 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews); 286 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews);
286 }; 287 };
287 288
288 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 289 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698