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

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

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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 CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_ 5 #ifndef CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_
6 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_ 6 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // the platform doesn't support status icons. 87 // the platform doesn't support status icons.
88 StatusIcon* status_icon_; 88 StatusIcon* status_icon_;
89 89
90 // These images are owned by ResourceBundle and need not be destroyed. 90 // These images are owned by ResourceBundle and need not be destroyed.
91 gfx::ImageSkia* mic_image_; 91 gfx::ImageSkia* mic_image_;
92 gfx::ImageSkia* camera_image_; 92 gfx::ImageSkia* camera_image_;
93 93
94 // A map that contains the usage counts of the opened capture devices for each 94 // A map that contains the usage counts of the opened capture devices for each
95 // WebContents instance. 95 // WebContents instance.
96 base::ScopedPtrHashMap<content::WebContents*, 96 base::ScopedPtrHashMap<content::WebContents*,
97 WebContentsDeviceUsage> usage_map_; 97 scoped_ptr<WebContentsDeviceUsage>> usage_map_;
98 98
99 // A vector which maps command IDs to their associated WebContents 99 // A vector which maps command IDs to their associated WebContents
100 // instance. This is rebuilt each time the status tray icon context menu is 100 // instance. This is rebuilt each time the status tray icon context menu is
101 // updated. 101 // updated.
102 typedef std::vector<content::WebContents*> CommandTargets; 102 typedef std::vector<content::WebContents*> CommandTargets;
103 CommandTargets command_targets_; 103 CommandTargets command_targets_;
104 104
105 DISALLOW_COPY_AND_ASSIGN(MediaStreamCaptureIndicator); 105 DISALLOW_COPY_AND_ASSIGN(MediaStreamCaptureIndicator);
106 }; 106 };
107 107
108 #endif // CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_ 108 #endif // CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698