| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/media/desktop_media_picker.h" | 5 #include "chrome/browser/media/desktop_media_picker.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "chrome/browser/media/desktop_media_list.h" | 8 #include "chrome/browser/media/desktop_media_list.h" |
| 9 #include "chrome/browser/media/desktop_media_list_observer.h" | 9 #include "chrome/browser/media/desktop_media_list_observer.h" |
| 10 #include "chrome/browser/ui/ash/ash_util.h" | 10 #include "chrome/browser/ui/ash/ash_util.h" |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 label_->SetText(l10n_util::GetStringFUTF16( | 511 label_->SetText(l10n_util::GetStringFUTF16( |
| 512 IDS_DESKTOP_MEDIA_PICKER_TEXT_DELEGATED, app_name, target_name)); | 512 IDS_DESKTOP_MEDIA_PICKER_TEXT_DELEGATED, app_name, target_name)); |
| 513 } | 513 } |
| 514 label_->SetMultiLine(true); | 514 label_->SetMultiLine(true); |
| 515 label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); | 515 label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
| 516 AddChildView(label_); | 516 AddChildView(label_); |
| 517 | 517 |
| 518 scroll_view_->SetContents(list_view_); | 518 scroll_view_->SetContents(list_view_); |
| 519 AddChildView(scroll_view_); | 519 AddChildView(scroll_view_); |
| 520 | 520 |
| 521 // TODO(gbillock): Use PopupManager here. |
| 521 WebContentsModalDialogManager* web_contents_modal_dialog_manager = | 522 WebContentsModalDialogManager* web_contents_modal_dialog_manager = |
| 522 WebContentsModalDialogManager::FromWebContents(parent_web_contents); | 523 WebContentsModalDialogManager::FromWebContents(parent_web_contents); |
| 523 DCHECK(web_contents_modal_dialog_manager); | 524 DCHECK(web_contents_modal_dialog_manager); |
| 524 WebContentsModalDialogManagerDelegate* delegate = | 525 WebContentsModalDialogManagerDelegate* delegate = |
| 525 web_contents_modal_dialog_manager->delegate(); | 526 web_contents_modal_dialog_manager->delegate(); |
| 526 DCHECK(delegate); | 527 DCHECK(delegate); |
| 527 views::Widget::CreateWindowAsFramelessChild( | 528 views::Widget::CreateWindowAsFramelessChild( |
| 528 this, | 529 this, |
| 529 delegate->GetWebContentsModalDialogHost()->GetHostView()); | 530 delegate->GetWebContentsModalDialogHost()->GetHostView()); |
| 530 | 531 |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 base::Bind(callback_, source)); | 665 base::Bind(callback_, source)); |
| 665 callback_.Reset(); | 666 callback_.Reset(); |
| 666 } | 667 } |
| 667 | 668 |
| 668 } // namespace | 669 } // namespace |
| 669 | 670 |
| 670 // static | 671 // static |
| 671 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { | 672 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { |
| 672 return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews()); | 673 return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews()); |
| 673 } | 674 } |
| OLD | NEW |