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

Side by Side Diff: chrome/browser/ui/webui/options/media_devices_selection_handler.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h" 5 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/prefs/pref_service.h"
12 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
14 #include "chrome/grit/generated_resources.h" 13 #include "chrome/grit/generated_resources.h"
14 #include "components/prefs/pref_service.h"
15 15
16 namespace { 16 namespace {
17 17
18 const char kAudio[] = "mic"; 18 const char kAudio[] = "mic";
19 const char kVideo[] = "camera"; 19 const char kVideo[] = "camera";
20 20
21 } // namespace 21 } // namespace
22 22
23 namespace options { 23 namespace options {
24 24
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 case VIDEO: 140 case VIDEO:
141 devices = MediaCaptureDevicesDispatcher::GetInstance()-> 141 devices = MediaCaptureDevicesDispatcher::GetInstance()->
142 GetVideoCaptureDevices(); 142 GetVideoCaptureDevices();
143 break; 143 break;
144 } 144 }
145 145
146 UpdateDevicesMenu(type, devices); 146 UpdateDevicesMenu(type, devices);
147 } 147 }
148 148
149 } // namespace options 149 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698