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

Unified Diff: chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h

Issue 1958293002: Revert "Desktop Capture Picker New UI: Non Mac Structure Change" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h
deleted file mode 100644
index 09023a20532337786b2a27be2340f758a40fe642..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_PICKER_VIEWS_H_
-#define CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_PICKER_VIEWS_H_
-
-#include "base/macros.h"
-#include "chrome/browser/media/desktop_media_list_observer.h"
-#include "chrome/browser/media/desktop_media_picker.h"
-#include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
-#include "ui/views/window/dialog_delegate.h"
-
-namespace views {
-class ImageView;
-class Label;
-class Checkbox;
-class TabbedPane;
-} // namespace views
-
-class DesktopMediaPickerDialogView;
-class DesktopMediaPickerViews;
-class DesktopMediaSourceView;
-
-// View that shows a list of desktop media sources available from
-// DesktopMediaList.
-class DesktopMediaListView : public views::View,
- public DesktopMediaListObserver {
- public:
- DesktopMediaListView(DesktopMediaPickerDialogView* parent,
- std::unique_ptr<DesktopMediaList> media_list);
- ~DesktopMediaListView() override;
-
- void StartUpdating(content::DesktopMediaID dialog_window_id);
-
- // Called by DesktopMediaSourceView when selection has changed.
- void OnSelectionChanged();
-
- // Called by DesktopMediaSourceView when a source has been double-clicked.
- void OnDoubleClick();
-
- // Returns currently selected source.
- DesktopMediaSourceView* GetSelection();
-
- // views::View overrides.
- gfx::Size GetPreferredSize() const override;
- void Layout() override;
- bool OnKeyPressed(const ui::KeyEvent& event) override;
-
- private:
- // DesktopMediaList::Observer interface
- void OnSourceAdded(DesktopMediaList* list, int index) override;
- void OnSourceRemoved(DesktopMediaList* list, int index) override;
- void OnSourceMoved(DesktopMediaList* list,
- int old_index,
- int new_index) override;
- void OnSourceNameChanged(DesktopMediaList* list, int index) override;
- void OnSourceThumbnailChanged(DesktopMediaList* list, int index) override;
-
- // Accepts whatever happens to be selected right now.
- void AcceptSelection();
-
- DesktopMediaPickerDialogView* parent_;
- std::unique_ptr<DesktopMediaList> media_list_;
- base::WeakPtrFactory<DesktopMediaListView> weak_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaListView);
-};
-
-// View used for each item in DesktopMediaListView. Shows a single desktop media
-// source as a thumbnail with the title under it.
-class DesktopMediaSourceView : public views::View {
- public:
- DesktopMediaSourceView(DesktopMediaListView* parent,
- content::DesktopMediaID source_id);
- ~DesktopMediaSourceView() override;
-
- // Updates thumbnail and title from |source|.
- void SetName(const base::string16& name);
- void SetThumbnail(const gfx::ImageSkia& thumbnail);
-
- // Id for the source shown by this View.
- const content::DesktopMediaID& source_id() const { return source_id_; }
-
- // Returns true if the source is selected.
- bool is_selected() const { return selected_; }
-
- // views::View interface.
- const char* GetClassName() const override;
- void Layout() override;
- views::View* GetSelectedViewForGroup(int group) override;
- bool IsGroupFocusTraversable() const override;
- void OnPaint(gfx::Canvas* canvas) override;
- void OnFocus() override;
- void OnBlur() override;
- bool OnMousePressed(const ui::MouseEvent& event) override;
- void OnGestureEvent(ui::GestureEvent* event) override;
-
- private:
- // Updates selection state of the element. If |selected| is true then also
- // calls SetSelected(false) for the source view that was selected before that
- // (if any).
- void SetSelected(bool selected);
-
- DesktopMediaListView* parent_;
- content::DesktopMediaID source_id_;
-
- views::ImageView* image_view_;
- views::Label* label_;
-
- bool selected_;
-
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaSourceView);
-};
-
-// Dialog view used for DesktopMediaPickerViews.
-class DesktopMediaPickerDialogView : public views::DialogDelegateView,
- public views::TabbedPaneListener {
- public:
- DesktopMediaPickerDialogView(content::WebContents* parent_web_contents,
- gfx::NativeWindow context,
- DesktopMediaPickerViews* parent,
- const base::string16& app_name,
- const base::string16& target_name,
- std::unique_ptr<DesktopMediaList> screen_list,
- std::unique_ptr<DesktopMediaList> window_list,
- std::unique_ptr<DesktopMediaList> tab_list,
- bool request_audio);
- ~DesktopMediaPickerDialogView() override;
-
- // Called by parent (DesktopMediaPickerViews) when it's destroyed.
- void DetachParent();
-
- // Called by DesktopMediaListView.
- void OnSelectionChanged();
- void OnDoubleClick();
-
- // views::TabbedPaneListener overrides.
- void TabSelectedAt(int index) override;
-
- // views::View overrides.
- gfx::Size GetPreferredSize() const override;
-
- // views::DialogDelegateView overrides.
- ui::ModalType GetModalType() const override;
- base::string16 GetWindowTitle() const override;
- bool IsDialogButtonEnabled(ui::DialogButton button) const override;
- views::View* GetInitiallyFocusedView() override;
- bool ShouldDefaultButtonBeBlue() const override;
- base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
- View* CreateExtraView() override;
- bool Accept() override;
- void DeleteDelegate() override;
-
- void OnMediaListRowsChanged();
-
- DesktopMediaListView* GetMediaListViewForTesting() const;
- DesktopMediaSourceView* GetMediaSourceViewForTesting(int index) const;
- views::Checkbox* GetCheckboxForTesting() const;
- int GetIndexOfSourceTypeForTesting(
- content::DesktopMediaID::Type source_type) const;
- views::TabbedPane* GetPaneForTesting() const;
-
- private:
- void SwitchSourceType(int index);
-
- DesktopMediaPickerViews* parent_;
-
- views::Label* description_label_;
-
- views::Checkbox* audio_share_checkbox_;
-
- views::TabbedPane* pane_;
- std::vector<DesktopMediaListView*> list_views_;
- std::vector<content::DesktopMediaID::Type> source_types_;
-
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerDialogView);
-};
-
-// Implementation of DesktopMediaPicker for Views.
-class DesktopMediaPickerViews : public DesktopMediaPicker {
- public:
- DesktopMediaPickerViews();
- ~DesktopMediaPickerViews() override;
-
- void NotifyDialogResult(content::DesktopMediaID source);
-
- // DesktopMediaPicker overrides.
- void Show(content::WebContents* web_contents,
- gfx::NativeWindow context,
- gfx::NativeWindow parent,
- const base::string16& app_name,
- const base::string16& target_name,
- std::unique_ptr<DesktopMediaList> screen_list,
- std::unique_ptr<DesktopMediaList> window_list,
- std::unique_ptr<DesktopMediaList> tab_list,
- bool request_audio,
- const DoneCallback& done_callback) override;
-
- DesktopMediaPickerDialogView* GetDialogViewForTesting() const {
- return dialog_;
- }
-
- private:
- DoneCallback callback_;
-
- // The |dialog_| is owned by the corresponding views::Widget instance.
- // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed
- // asynchronously by closing the widget.
- DesktopMediaPickerDialogView* dialog_;
-
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews);
-};
-
-#endif // CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_PICKER_VIEWS_H_
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698