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

Unified Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc

Issue 89683003: Rename DesktopMediaPickerModel[Impl]->[Native]DesktopMediaList (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
index 0fe1a831a023abfc6f1e3091ac6522b40e3950ff..fb94f77f45c7c90e5e4a97b16989ce42a7bef453 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
@@ -9,6 +9,7 @@
#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"
@@ -160,16 +161,16 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunImpl() {
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
@@ -184,7 +185,7 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunImpl() {
picker_->Show(parent_window, parent_window,
UTF8ToUTF16(GetExtension()->name()),
- model.Pass(), callback);
+ media_list.Pass(), callback);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698