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

Side by Side Diff: content/renderer/browser_plugin/browser_plugin_manager.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_ 5 #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_
6 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_ 6 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_
7 7
8 #include "base/id_map.h" 8 #include "base/id_map.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 BrowserPlugin* browser_plugin); 47 BrowserPlugin* browser_plugin);
48 void RemoveBrowserPlugin(int browser_plugin_instance_id); 48 void RemoveBrowserPlugin(int browser_plugin_instance_id);
49 BrowserPlugin* GetBrowserPlugin(int browser_plugin_instance_id) const; 49 BrowserPlugin* GetBrowserPlugin(int browser_plugin_instance_id) const;
50 50
51 void UpdateDeviceScaleFactor(); 51 void UpdateDeviceScaleFactor();
52 void UpdateFocusState(); 52 void UpdateFocusState();
53 RenderViewImpl* render_view() const { return render_view_.get(); } 53 RenderViewImpl* render_view() const { return render_view_.get(); }
54 int GetNextInstanceID(); 54 int GetNextInstanceID();
55 55
56 // RenderViewObserver override. Call on render thread. 56 // RenderViewObserver override. Call on render thread.
57 virtual void DidCommitCompositorFrame() OVERRIDE; 57 virtual void DidCommitCompositorFrame() override;
58 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 58 virtual bool OnMessageReceived(const IPC::Message& message) override;
59 virtual bool Send(IPC::Message* msg) OVERRIDE; 59 virtual bool Send(IPC::Message* msg) override;
60 60
61 // Don't destroy the BrowserPluginManager when the RenderViewImpl goes away. 61 // Don't destroy the BrowserPluginManager when the RenderViewImpl goes away.
62 // BrowserPluginManager's lifetime is managed by a reference count. Once 62 // BrowserPluginManager's lifetime is managed by a reference count. Once
63 // the host RenderViewImpl and all BrowserPlugins release their references, 63 // the host RenderViewImpl and all BrowserPlugins release their references,
64 // then the BrowserPluginManager will be destroyed. 64 // then the BrowserPluginManager will be destroyed.
65 virtual void OnDestruct() OVERRIDE {} 65 virtual void OnDestruct() override {}
66 66
67 protected: 67 protected:
68 // Friend RefCounted so that the dtor can be non-public. 68 // Friend RefCounted so that the dtor can be non-public.
69 friend class base::RefCounted<BrowserPluginManager>; 69 friend class base::RefCounted<BrowserPluginManager>;
70 70
71 virtual ~BrowserPluginManager(); 71 virtual ~BrowserPluginManager();
72 // This map is keyed by guest instance IDs. 72 // This map is keyed by guest instance IDs.
73 IDMap<BrowserPlugin> instances_; 73 IDMap<BrowserPlugin> instances_;
74 int current_instance_id_; 74 int current_instance_id_;
75 base::WeakPtr<RenderViewImpl> render_view_; 75 base::WeakPtr<RenderViewImpl> render_view_;
76 76
77 DISALLOW_COPY_AND_ASSIGN(BrowserPluginManager); 77 DISALLOW_COPY_AND_ASSIGN(BrowserPluginManager);
78 }; 78 };
79 79
80 } // namespace content 80 } // namespace content
81 81
82 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_ 82 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_
OLDNEW
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin.h ('k') | content/renderer/browser_render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698