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

Side by Side Diff: chrome/browser/media/desktop_media_list_ash.h

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_MEDIA_DESKTOP_MEDIA_LIST_ASH_H_ 5 #ifndef CHROME_BROWSER_MEDIA_DESKTOP_MEDIA_LIST_ASH_H_
6 #define CHROME_BROWSER_MEDIA_DESKTOP_MEDIA_LIST_ASH_H_ 6 #define CHROME_BROWSER_MEDIA_DESKTOP_MEDIA_LIST_ASH_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 22 matching lines...) Expand all
33 public: 33 public:
34 enum SourceTypes { 34 enum SourceTypes {
35 SCREENS = 1, 35 SCREENS = 1,
36 WINDOWS = 2, 36 WINDOWS = 2,
37 }; 37 };
38 38
39 explicit DesktopMediaListAsh(int source_types); 39 explicit DesktopMediaListAsh(int source_types);
40 virtual ~DesktopMediaListAsh(); 40 virtual ~DesktopMediaListAsh();
41 41
42 // DesktopMediaList interface. 42 // DesktopMediaList interface.
43 virtual void SetUpdatePeriod(base::TimeDelta period) OVERRIDE; 43 virtual void SetUpdatePeriod(base::TimeDelta period) override;
44 virtual void SetThumbnailSize(const gfx::Size& thumbnail_size) OVERRIDE; 44 virtual void SetThumbnailSize(const gfx::Size& thumbnail_size) override;
45 virtual void StartUpdating(DesktopMediaListObserver* observer) OVERRIDE; 45 virtual void StartUpdating(DesktopMediaListObserver* observer) override;
46 virtual int GetSourceCount() const OVERRIDE; 46 virtual int GetSourceCount() const override;
47 virtual const Source& GetSource(int index) const OVERRIDE; 47 virtual const Source& GetSource(int index) const override;
48 virtual void SetViewDialogWindowId( 48 virtual void SetViewDialogWindowId(
49 content::DesktopMediaID::Id dialog_id) OVERRIDE; 49 content::DesktopMediaID::Id dialog_id) override;
50 50
51 private: 51 private:
52 // Struct used to represent sources list the model gets from the Worker. 52 // Struct used to represent sources list the model gets from the Worker.
53 struct SourceDescription { 53 struct SourceDescription {
54 SourceDescription(content::DesktopMediaID id, const base::string16& name); 54 SourceDescription(content::DesktopMediaID id, const base::string16& name);
55 55
56 content::DesktopMediaID id; 56 content::DesktopMediaID id;
57 base::string16 name; 57 base::string16 name;
58 }; 58 };
59 59
(...skipping 30 matching lines...) Expand all
90 std::vector<Source> sources_; 90 std::vector<Source> sources_;
91 91
92 int pending_window_capture_requests_; 92 int pending_window_capture_requests_;
93 93
94 base::WeakPtrFactory<DesktopMediaListAsh> weak_factory_; 94 base::WeakPtrFactory<DesktopMediaListAsh> weak_factory_;
95 95
96 DISALLOW_COPY_AND_ASSIGN(DesktopMediaListAsh); 96 DISALLOW_COPY_AND_ASSIGN(DesktopMediaListAsh);
97 }; 97 };
98 98
99 #endif // CHROME_BROWSER_MEDIA_DESKTOP_MEDIA_LIST_ASH_H_ 99 #endif // CHROME_BROWSER_MEDIA_DESKTOP_MEDIA_LIST_ASH_H_
OLDNEW
« no previous file with comments | « chrome/browser/media/chrome_webrtc_webcam_browsertest.cc ('k') | chrome/browser/media/encrypted_media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698