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

Side by Side Diff: ui/ozone/platform/dri/dri_window.h

Issue 636233004: remove some new OVERRIDE instances in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix a few more new OVERRIDEs in ui/ Created 6 years, 2 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
« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/views/widget/native_widget_mac_interactive_uitest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_ 5 #ifndef UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
6 #define UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_ 6 #define UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "ui/events/platform/platform_event_dispatcher.h" 9 #include "ui/events/platform/platform_event_dispatcher.h"
10 #include "ui/gfx/geometry/rect.h" 10 #include "ui/gfx/geometry/rect.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 virtual void Minimize() override; 45 virtual void Minimize() override;
46 virtual void Restore() override; 46 virtual void Restore() override;
47 virtual void SetCursor(PlatformCursor cursor) override; 47 virtual void SetCursor(PlatformCursor cursor) override;
48 virtual void MoveCursorTo(const gfx::Point& location) override; 48 virtual void MoveCursorTo(const gfx::Point& location) override;
49 49
50 // PlatformEventDispatcher: 50 // PlatformEventDispatcher:
51 virtual bool CanDispatchEvent(const PlatformEvent& event) override; 51 virtual bool CanDispatchEvent(const PlatformEvent& event) override;
52 virtual uint32_t DispatchEvent(const PlatformEvent& event) override; 52 virtual uint32_t DispatchEvent(const PlatformEvent& event) override;
53 53
54 // ChannelObserver: 54 // ChannelObserver:
55 virtual void OnChannelEstablished() OVERRIDE; 55 virtual void OnChannelEstablished() override;
56 virtual void OnChannelDestroyed() OVERRIDE; 56 virtual void OnChannelDestroyed() override;
57 57
58 private: 58 private:
59 PlatformWindowDelegate* delegate_; // Not owned. 59 PlatformWindowDelegate* delegate_; // Not owned.
60 DriGpuPlatformSupportHost* sender_; // Not owned. 60 DriGpuPlatformSupportHost* sender_; // Not owned.
61 EventFactoryEvdev* event_factory_; // Not owned. 61 EventFactoryEvdev* event_factory_; // Not owned.
62 DriWindowManager* window_manager_; // Not owned. 62 DriWindowManager* window_manager_; // Not owned.
63 63
64 gfx::Rect bounds_; 64 gfx::Rect bounds_;
65 gfx::AcceleratedWidget widget_; 65 gfx::AcceleratedWidget widget_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(DriWindow); 67 DISALLOW_COPY_AND_ASSIGN(DriWindow);
68 }; 68 };
69 69
70 } // namespace ui 70 } // namespace ui
71 71
72 #endif // UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_ 72 #endif // UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/views/widget/native_widget_mac_interactive_uitest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698