Rename DesktopMediaPickerModel[Impl]->[Native]DesktopMediaList

chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h"
 
 #include "base/compiler_specific.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/media/desktop_streams_registry.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
+#include "chrome/browser/media/native_desktop_media_list.h"
 #include "chrome/common/extensions/api/tabs.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
 
 namespace extensions {
@@ skipping 131 matching lines @@
         error_ = kTabCaptureNotSupportedError;
         return false;
     }
   }
 
   if (!screen_capturer && !window_capturer) {
     error_ = kEmptySourcesListError;
     return false;
   }
 
-  scoped_ptr<DesktopMediaPickerModel> model;
+  scoped_ptr<DesktopMediaList> media_list;
   if (g_picker_factory) {
-    model = g_picker_factory->CreateModel(
+    media_list = g_picker_factory->CreateModel(
         screen_capturer.Pass(), window_capturer.Pass());
     picker_ = g_picker_factory->CreatePicker();
   } else {
     // DesktopMediaPicker is implemented only for Windows, OSX and
     // Aura Linux builds.
 #if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
-    model.reset(new DesktopMediaPickerModelImpl(
+    media_list.reset(new NativeDesktopMediaList(
         screen_capturer.Pass(), window_capturer.Pass()));
     picker_ = DesktopMediaPicker::Create();
 #else
     const char kNotImplementedError[] =
         "Desktop Capture API is not yet implemented for this platform.";
     error_ = kNotImplementedError;
     return false;
 #endif
   }
   DesktopMediaPicker::DoneCallback callback = base::Bind(
       &DesktopCaptureChooseDesktopMediaFunction::OnPickerDialogResults, this);
 
   picker_->Show(parent_window, parent_window,
                 UTF8ToUTF16(GetExtension()->name()),
-                model.Pass(), callback);
+                media_list.Pass(), callback);
   return true;
 }
 
 void DesktopCaptureChooseDesktopMediaFunction::OnPickerDialogResults(
     content::DesktopMediaID source) {
   std::string result;
   if (source.type != content::DesktopMediaID::TYPE_NONE) {
     DesktopStreamsRegistry* registry =
         MediaCaptureDevicesDispatcher::GetInstance()->
         GetDesktopStreamsRegistry();
@@ skipping 58 matching lines @@
 
 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
                                                    int request_id) {
   RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
   if (it != requests_.end())
     it->second->Cancel();
 }
 
 
 }  // namespace extensions