Bug 868428 - Remove left over capture picker css and code. r=sfoster
authorJim Mathies <jmathies@mozilla.com>
Tue, 07 May 2013 15:55:51 -0500
changeset 142134 86b2e2f3789c8a4e2b22e46333bbf2aebf389364
parent 142133 8939cbc62b399c46216f055bbcf64dffeda41aaf
child 142135 e371119710624760bcf8211b6a8980337fa5dde8
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfoster
bugs868428
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 868428 - Remove left over capture picker css and code. r=sfoster
browser/metro/components/CapturePicker.js
browser/metro/components/Makefile.in
browser/metro/theme/browser.css
deleted file mode 100644
--- a/browser/metro/components/CapturePicker.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil; -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-function CapturePicker() {
-  this.messageManager = Cc["@mozilla.org/childprocessmessagemanager;1"].getService(Ci.nsISyncMessageSender);
-}
-
-CapturePicker.prototype = {
-  _file: null,
-  _mode: -1,
-  _result: -1,
-  _shown: false,
-  _title: "",
-  _type: "",
-  _window: null,
-
-  //
-  // nsICapturePicker
-  //
-  init: function(aWindow, aTitle, aMode) {
-    this._window = aWindow;
-    this._title = aTitle;
-    this._mode = aMode;
-  },
-
-  show: function() {
-    if (this._shown)
-      throw Cr.NS_ERROR_UNEXPECTED;
-
-    this._shown = true;
-
-    let res = this.messageManager.sendSyncMessage("CapturePicker:Show", { title: this._title, mode: this._mode, type: this._type })[0];
-    if (res.value)
-      this._file = res.path;
-
-    return (res.value ? Ci.nsICapturePicker.RETURN_OK : Ci.nsICapturePicker.RETURN_CANCEL);
-  },
-
-  modeMayBeAvailable: function(aMode) {
-    if (aMode != Ci.nsICapturePicker.MODE_STILL)
-      return false;
-    return true;
-  },
-
-  get file() {
-    if (this._file) { 
-      let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
-      file.initWithPath(this._file);
-      let utils = this._window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-      return utils.wrapDOMFile(file);
-    } else {
-      throw Cr.NS_ERROR_FAILURE;
-    }
-  },
-
-  get type() {
-    return this._type;
-  },
-
-  set type(aNewType) {
-    if (this._shown)
-      throw Cr.NS_ERROR_UNEXPECTED;
-    else 
-      this._type = aNewType;
-  },
-
-  // QI
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsICapturePicker]),
-
-  // XPCOMUtils factory
-  classID: Components.ID("{cb5a47f0-b58c-4fc3-b61a-358ee95f8238}"),
-};
-
-var components = [ CapturePicker ];
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/browser/metro/components/Makefile.in
+++ b/browser/metro/components/Makefile.in
@@ -25,17 +25,16 @@ EXTRA_PP_COMPONENTS = \
 EXTRA_COMPONENTS = \
         AlertsService.js \
         ContentPermissionPrompt.js \
         DownloadManagerUI.js \
         PromptService.js \
         ContentDispatchChooser.js \
         FormAutoComplete.js \
         LoginManagerPrompter.js \
-        CapturePicker.js \
         $(NULL)
 
 ifdef MOZ_SAFE_BROWSING
 EXTRA_COMPONENTS += SafeBrowsing.js
 endif
 
 ifdef MOZ_UPDATER
 EXTRA_COMPONENTS += UpdatePrompt.js
--- a/browser/metro/theme/browser.css
+++ b/browser/metro/theme/browser.css
@@ -1194,22 +1194,8 @@ setting[type="radio"] > vbox {
 #selectionhandle-mark3 {
   list-style-image: url("chrome://browser/skin/images/selection-monocle.png");
   border: 0px solid gray;
   padding: 0px;
   margin-top: -30px;
   margin-left: -18px;
   pointer-events: auto;
 }
-
-/* Capture picker ------------------------------------------------------------- */
-
-#capturepicker-video {
-  border: @border_width_tiny@ solid white;
-}
-
-#capturepicker-container {
-  margin: @margin_normal@;
-}
-
-#capturepicker-container.vertical {
-  height: 330px;
-}