Remove Deprecate Code For Desktop Capture Picker Old UI

Remove Deprecate Code For Desktop Capture Picker Old UI

This is a code clean up CL, in which we remove the code for old UI of
desktop capture picker. As we found the new UI works well.

BUG=644811
Committed: https://crrev.com/41e08a84665f6d5deeaf5c2ddabb7cbcdf7f8752
Cr-Commit-Position: refs/heads/master@{#438629}

[qiangchen, 2016-12-09 22:56:41]

The CQ bit was checked by qiangchen@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-09 22:57:25]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[qiangchen, 2016-12-09 23:00:45]

Description was changed from

==========
Remove Deprecate Code For Desktop Capture Picker Old UI

BUG=
==========

to

==========
Remove Deprecate Code For Desktop Capture Picker Old UI

This is a code clean up CL, in which we remove the code for old UI of
desktop capture picker. As we found the new UI works well.

BUG=644811
==========

[qiangchen, 2016-12-09 23:00:45]

qiangchen@chromium.org changed reviewers:
+ msw@chromium.org, rockot@chromium.org

[qiangchen, 2016-12-09 23:14:43]

The CQ bit was checked by qiangchen@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-09 23:15:17]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[qiangchen, 2016-12-09 23:15:22]

The CQ bit was checked by qiangchen@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-09 23:15:59]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-10 01:18:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-10 01:18:11]

Dry run: Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_TIMED_OUT, no build
URL)

[qiangchen, 2016-12-12 17:01:03]

Can you take a look? Deprecate code removal.

[msw, 2016-12-12 20:19:59]

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/cocoa...
File chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm (left):

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/cocoa...
chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm:33:
controller_deprecated_.reset([[DesktopMediaPickerControllerDeprecated alloc]
Remove this member from desktop_media_picker_cocoa.h

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/cocoa...
File chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm (right):

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/cocoa...
chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm:9: #include
"base/command_line.h"
nit: remove

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/cocoa...
chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm:11: #include
"extensions/common/switches.h"
nit: remove

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/views...
File chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
(right):

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc:8:
#include "base/command_line.h"
nit: remove

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc:22:
#include "extensions/common/switches.h"
nit: remove

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/views...
File chrome/browser/ui/views/desktop_media_picker_views_deprecated.cc (left):

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/desktop_media_picker_views_deprecated.cc:456:
IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_NONE));
Remove these resources:
IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_MAC
IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_NONE
IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_WINDOW
IDS_DESKTOP_MEDIA_PICKER_TITLE_DEPRECATED
(and any other unused ones that I missed)

[qiangchen, 2016-12-12 20:41:29]

Thanks. Removed the unused resources.

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/cocoa...
File chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm (left):

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/cocoa...
chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm:33:
controller_deprecated_.reset([[DesktopMediaPickerControllerDeprecated alloc]
On 2016/12/12 20:19:58, msw wrote:
> Remove this member from desktop_media_picker_cocoa.h

Done.

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/cocoa...
File chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm (right):

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/cocoa...
chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm:9: #include
"base/command_line.h"
On 2016/12/12 20:19:58, msw wrote:
> nit: remove

Done.

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/cocoa...
chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm:11: #include
"extensions/common/switches.h"
On 2016/12/12 20:19:59, msw wrote:
> nit: remove

Done.

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/views...
File chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
(right):

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc:8:
#include "base/command_line.h"
On 2016/12/12 20:19:59, msw wrote:
> nit: remove

Done.

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc:22:
#include "extensions/common/switches.h"
On 2016/12/12 20:19:59, msw wrote:
> nit: remove

Done.

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/views...
File chrome/browser/ui/views/desktop_media_picker_views_deprecated.cc (left):

https://codereview.chromium.org/2560333002/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/desktop_media_picker_views_deprecated.cc:456:
IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_NONE));
On 2016/12/12 20:19:58, msw wrote:
> Remove these resources:
> IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_MAC
> IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_NONE
> IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_WINDOW
> IDS_DESKTOP_MEDIA_PICKER_TITLE_DEPRECATED
> (and any other unused ones that I missed)

Done.

[qiangchen, 2016-12-12 20:41:34]

The CQ bit was checked by qiangchen@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-12 20:43:21]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[msw, 2016-12-12 20:46:44]

lgtm

[qiangchen, 2016-12-12 21:02:27]

rockot@: Can you take a look at the two files in folder extension/ ?

[commit-bot: I haz the power, 2016-12-12 23:47:56]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-12 23:47:56]

Dry run: This issue passed the CQ dry run.

[Ken Rockot(use gerrit already), 2016-12-13 19:07:32]

lgtm

[qiangchen, 2016-12-13 20:47:02]

The CQ bit was checked by qiangchen@chromium.org

[commit-bot: I haz the power, 2016-12-13 20:48:10]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-13 20:57:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-13 20:57:05]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[qiangchen, 2016-12-13 21:09:12]

qiangchen@chromium.org changed reviewers:
+ sergeyu@chromium.org

[qiangchen, 2016-12-13 21:10:33]

Hi, sergeyu@: Can you take a look at this CL? Or more specifically the files in
folder chrome/browser/media.

As the new UI separate different types of sources into different containers, we
no longer need the CombinedDesktopMediaList.

[Sergey Ulanov, 2016-12-14 00:23:32]

lgtm

[qiangchen, 2016-12-14 00:26:22]

The CQ bit was checked by qiangchen@chromium.org

[commit-bot: I haz the power, 2016-12-14 00:26:55]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-14 01:45:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-14 01:45:26]

Failed to apply patch for extensions/common/switches.h:
While running git apply --index -p1;
  error: patch failed: extensions/common/switches.h:14
  error: extensions/common/switches.h: patch does not apply

Patch:       extensions/common/switches.h
Index: extensions/common/switches.h
diff --git a/extensions/common/switches.h b/extensions/common/switches.h
index
d90fe1567382fd8d8e47de5660622c636b9bad43..5363677e4e7be71cb3fbee72f15fe75bce12efa8
100644
--- a/extensions/common/switches.h
+++ b/extensions/common/switches.h
@@ -14,7 +14,6 @@ namespace switches {
 extern const char kAllowHTTPBackgroundPage[];
 extern const char kAllowLegacyExtensionManifests[];
 extern const char kDisableDesktopCaptureAudio[];
-extern const char kDisableDesktopCapturePickerNewUI[];
 extern const char kDisableTabForDesktopShare[];
 extern const char kEmbeddedExtensionOptions[];
 extern const char kEnableAppsShowOnFirstPaint[];

[qiangchen, 2016-12-14 17:04:07]

The CQ bit was checked by qiangchen@chromium.org

[commit-bot: I haz the power, 2016-12-14 17:04:33]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-14 18:49:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-14 18:49:17]

Failed to apply patch for extensions/common/switches.h:
While running git apply --index -p1;
  error: patch failed: extensions/common/switches.h:14
  error: extensions/common/switches.h: patch does not apply

Patch:       extensions/common/switches.h
Index: extensions/common/switches.h
diff --git a/extensions/common/switches.h b/extensions/common/switches.h
index
d90fe1567382fd8d8e47de5660622c636b9bad43..5363677e4e7be71cb3fbee72f15fe75bce12efa8
100644
--- a/extensions/common/switches.h
+++ b/extensions/common/switches.h
@@ -14,7 +14,6 @@ namespace switches {
 extern const char kAllowHTTPBackgroundPage[];
 extern const char kAllowLegacyExtensionManifests[];
 extern const char kDisableDesktopCaptureAudio[];
-extern const char kDisableDesktopCapturePickerNewUI[];
 extern const char kDisableTabForDesktopShare[];
 extern const char kEmbeddedExtensionOptions[];
 extern const char kEnableAppsShowOnFirstPaint[];

[qiangchen, 2016-12-14 19:23:45]

Patchset #4 (id:60001) has been deleted

[qiangchen, 2016-12-14 19:28:20]

The CQ bit was checked by qiangchen@chromium.org

[qiangchen, 2016-12-14 19:28:20]

The patchset sent to the CQ was uploaded after l-g-t-m from
sergeyu@chromium.org, rockot@chromium.org, msw@chromium.org
Link to the patchset: https://codereview.chromium.org/2560333002/#ps80001
(title: "Rebase")

[commit-bot: I haz the power, 2016-12-14 19:28:54]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-14 21:24:04]

CQ is committing da patch.

Bot data: {"patchset_id": 80001, "attempt_start_ts": 1481743700378480,
"parent_rev": "69ce85ffcdb817a32f3ca8549716aa9d6112a06b", "commit_rev":
"8dbb0c63516cca76b8cbe538e258ac09720223d2"}

[commit-bot: I haz the power, 2016-12-14 21:24:40]

Description was changed from

==========
Remove Deprecate Code For Desktop Capture Picker Old UI

This is a code clean up CL, in which we remove the code for old UI of
desktop capture picker. As we found the new UI works well.

BUG=644811
==========

to

==========
Remove Deprecate Code For Desktop Capture Picker Old UI

This is a code clean up CL, in which we remove the code for old UI of
desktop capture picker. As we found the new UI works well.

BUG=644811

Review-Url: https://codereview.chromium.org/2560333002
==========

[commit-bot: I haz the power, 2016-12-14 21:24:41]

Committed patchset #4 (id:80001)

[commit-bot: I haz the power, 2016-12-14 21:28:38]

Description was changed from

==========
Remove Deprecate Code For Desktop Capture Picker Old UI

This is a code clean up CL, in which we remove the code for old UI of
desktop capture picker. As we found the new UI works well.

BUG=644811

Review-Url: https://codereview.chromium.org/2560333002
==========

to

==========
Remove Deprecate Code For Desktop Capture Picker Old UI

This is a code clean up CL, in which we remove the code for old UI of
desktop capture picker. As we found the new UI works well.

BUG=644811

Committed: https://crrev.com/41e08a84665f6d5deeaf5c2ddabb7cbcdf7f8752
Cr-Commit-Position: refs/heads/master@{#438629}
==========

[commit-bot: I haz the power, 2016-12-14 21:28:40]

Patchset 4 (id:??) landed as
https://crrev.com/41e08a84665f6d5deeaf5c2ddabb7cbcdf7f8752
Cr-Commit-Position: refs/heads/master@{#438629}