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

Side by Side Diff: chrome/browser/ui/ash/media_delegate_chromeos.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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 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 CHROME_BROWSER_UI_ASH_MEDIA_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_MEDIA_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_MEDIA_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_MEDIA_DELEGATE_CHROMEOS_H_
7 7
8 #include "ash/media_delegate.h" 8 #include "ash/media_delegate.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 10 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
11 11
12 class MediaDelegateChromeOS : public ash::MediaDelegate, 12 class MediaDelegateChromeOS : public ash::MediaDelegate,
13 MediaCaptureDevicesDispatcher::Observer { 13 MediaCaptureDevicesDispatcher::Observer {
14 public: 14 public:
15 MediaDelegateChromeOS(); 15 MediaDelegateChromeOS();
16 virtual ~MediaDelegateChromeOS(); 16 virtual ~MediaDelegateChromeOS();
17 17
18 // ash::MediaDelegate: 18 // ash::MediaDelegate:
19 virtual void HandleMediaNextTrack() OVERRIDE; 19 virtual void HandleMediaNextTrack() override;
20 virtual void HandleMediaPlayPause() OVERRIDE; 20 virtual void HandleMediaPlayPause() override;
21 virtual void HandleMediaPrevTrack() OVERRIDE; 21 virtual void HandleMediaPrevTrack() override;
22 virtual ash::MediaCaptureState GetMediaCaptureState( 22 virtual ash::MediaCaptureState GetMediaCaptureState(
23 content::BrowserContext* context) OVERRIDE; 23 content::BrowserContext* context) override;
24 24
25 // MediaCaptureDevicesDispatcher::Observer: 25 // MediaCaptureDevicesDispatcher::Observer:
26 virtual void OnRequestUpdate(int render_process_id, 26 virtual void OnRequestUpdate(int render_process_id,
27 int render_frame_id, 27 int render_frame_id,
28 content::MediaStreamType stream_type, 28 content::MediaStreamType stream_type,
29 const content::MediaRequestState state) OVERRIDE; 29 const content::MediaRequestState state) override;
30 30
31 private: 31 private:
32 void NotifyMediaCaptureChange(); 32 void NotifyMediaCaptureChange();
33 33
34 base::WeakPtrFactory<MediaDelegateChromeOS> weak_ptr_factory_; 34 base::WeakPtrFactory<MediaDelegateChromeOS> weak_ptr_factory_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(MediaDelegateChromeOS); 36 DISALLOW_COPY_AND_ASSIGN(MediaDelegateChromeOS);
37 }; 37 };
38 38
39 #endif // CHROME_BROWSER_UI_ASH_MEDIA_DELEGATE_CHROMEOS_H_ 39 #endif // CHROME_BROWSER_UI_ASH_MEDIA_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698