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

Side by Side Diff: chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

Issue 2713803002: Views/Harmony: Use LayoutDelegate::GetMetric for views::kPanelVertMargin. (Closed)
Patch Set: Fix many crashes. Created 3 years, 10 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 unified diff | Download patch
OLDNEW
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/ui/views/desktop_capture/desktop_media_picker_views.h" 5 #include "chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "chrome/browser/media/webrtc/desktop_media_list.h" 8 #include "chrome/browser/media/webrtc/desktop_media_list.h"
9 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
10 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h" 11 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h"
12 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h" 12 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h"
13 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
13 #include "chrome/grit/chromium_strings.h" 14 #include "chrome/grit/chromium_strings.h"
14 #include "chrome/grit/generated_resources.h" 15 #include "chrome/grit/generated_resources.h"
15 #include "components/constrained_window/constrained_window_views.h" 16 #include "components/constrained_window/constrained_window_views.h"
16 #include "components/strings/grit/components_strings.h" 17 #include "components/strings/grit/components_strings.h"
17 #include "components/web_modal/web_contents_modal_dialog_manager.h" 18 #include "components/web_modal/web_contents_modal_dialog_manager.h"
18 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/render_frame_host.h" 20 #include "content/public/browser/render_frame_host.h"
20 #include "content/public/browser/web_contents_delegate.h" 21 #include "content/public/browser/web_contents_delegate.h"
21 #include "ui/aura/window_tree_host.h" 22 #include "ui/aura/window_tree_host.h"
22 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 const base::string16& target_name, 58 const base::string16& target_name,
58 std::unique_ptr<DesktopMediaList> screen_list, 59 std::unique_ptr<DesktopMediaList> screen_list,
59 std::unique_ptr<DesktopMediaList> window_list, 60 std::unique_ptr<DesktopMediaList> window_list,
60 std::unique_ptr<DesktopMediaList> tab_list, 61 std::unique_ptr<DesktopMediaList> tab_list,
61 bool request_audio) 62 bool request_audio)
62 : parent_(parent), 63 : parent_(parent),
63 description_label_(new views::Label()), 64 description_label_(new views::Label()),
64 audio_share_checkbox_(nullptr), 65 audio_share_checkbox_(nullptr),
65 pane_(new views::TabbedPane()) { 66 pane_(new views::TabbedPane()) {
66 SetLayoutManager(new views::BoxLayout( 67 SetLayoutManager(new views::BoxLayout(
67 views::BoxLayout::kVertical, views::kButtonHEdgeMarginNew, 68 views::BoxLayout::kVertical, views::kButtonHEdgeMarginNew,
68 views::kPanelVertMargin, views::kLabelToControlVerticalSpacing)); 69 LayoutDelegate::Get()->GetMetric(
70 LayoutDelegate::Metric::PANEL_CONTENT_MARGIN),
71 views::kLabelToControlVerticalSpacing));
69 72
70 description_label_->SetMultiLine(true); 73 description_label_->SetMultiLine(true);
71 description_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); 74 description_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
72 AddChildView(description_label_); 75 AddChildView(description_label_);
73 76
74 const SkColor bg_color = GetNativeTheme()->GetSystemColor( 77 const SkColor bg_color = GetNativeTheme()->GetSystemColor(
75 ui::NativeTheme::kColorId_DialogBackground); 78 ui::NativeTheme::kColorId_DialogBackground);
76 79
77 if (screen_list) { 80 if (screen_list) {
78 source_types_.push_back(DesktopMediaID::TYPE_SCREEN); 81 source_types_.push_back(DesktopMediaID::TYPE_SCREEN);
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 // DesktopMediaPicker. 447 // DesktopMediaPicker.
445 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, 448 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
446 base::Bind(callback_, source)); 449 base::Bind(callback_, source));
447 callback_.Reset(); 450 callback_.Reset();
448 } 451 }
449 452
450 // static 453 // static
451 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { 454 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
452 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews()); 455 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
453 } 456 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698