Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/app_list/arc/arc_app_dialog.h" | 5 #include "chrome/browser/ui/app_list/arc/arc_app_dialog.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/extensions/extension_util.h" | 10 #include "chrome/browser/extensions/extension_util.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" | 12 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" |
| 13 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h" | 13 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h" |
| 14 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" | 14 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" |
| 15 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" | 15 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" |
| 16 #include "chrome/browser/ui/native_window_tracker.h" | 16 #include "chrome/browser/ui/native_window_tracker.h" |
| 17 #include "chrome/browser/ui/views/harmony/layout_delegate.h" | 17 #include "chrome/browser/ui/views/harmony/chrome_views_layout_delegate.h" |
| 18 #include "chrome/grit/generated_resources.h" | 18 #include "chrome/grit/generated_resources.h" |
| 19 #include "components/constrained_window/constrained_window_views.h" | 19 #include "components/constrained_window/constrained_window_views.h" |
| 20 #include "components/strings/grit/components_strings.h" | 20 #include "components/strings/grit/components_strings.h" |
| 21 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
| 22 #include "ui/base/ui_base_types.h" | 22 #include "ui/base/ui_base_types.h" |
| 23 #include "ui/views/controls/image_view.h" | 23 #include "ui/views/controls/image_view.h" |
| 24 #include "ui/views/controls/label.h" | 24 #include "ui/views/controls/label.h" |
| 25 #include "ui/views/layout/box_layout.h" | 25 #include "ui/views/layout/box_layout.h" |
| 26 #include "ui/views/layout/layout_constants.h" | 26 #include "ui/views/layout/layout_constants.h" |
| 27 #include "ui/views/view.h" | 27 #include "ui/views/view.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 131 app_id_(app_id), | 131 app_id_(app_id), |
| 132 window_title_(window_title), | 132 window_title_(window_title), |
| 133 confirm_button_text_(confirm_button_text), | 133 confirm_button_text_(confirm_button_text), |
| 134 cancel_button_text_(cancel_button_text), | 134 cancel_button_text_(cancel_button_text), |
| 135 confirm_callback_(confirm_callback) { | 135 confirm_callback_(confirm_callback) { |
| 136 DCHECK(controller); | 136 DCHECK(controller); |
| 137 parent_ = controller_->GetAppListWindow(); | 137 parent_ = controller_->GetAppListWindow(); |
| 138 if (parent_) | 138 if (parent_) |
| 139 parent_window_tracker_ = NativeWindowTracker::Create(parent_); | 139 parent_window_tracker_ = NativeWindowTracker::Create(parent_); |
| 140 | 140 |
| 141 // TODO: Harmony - review the use of constants below | |
|
Peter Kasting
2017/03/30 00:49:04
Nit: I wouldn't add this TODO for now, as we haven
kylix_rd
2017/03/30 19:34:07
Done.
| |
| 141 SetLayoutManager(new views::BoxLayout( | 142 SetLayoutManager(new views::BoxLayout( |
| 142 views::BoxLayout::kHorizontal, views::kButtonHEdgeMarginNew, | 143 views::BoxLayout::kHorizontal, views::kButtonHEdgeMarginNew, |
| 143 LayoutDelegate::Get()->GetMetric( | 144 ChromeViewsLayoutDelegate::Get()->GetDistanceMetric( |
| 144 LayoutDelegate::Metric::PANEL_CONTENT_MARGIN), | 145 ChromeDistanceMetric::PANEL_CONTENT_MARGIN), |
| 145 views::kRelatedControlHorizontalSpacing)); | 146 views::kRelatedControlHorizontalSpacing)); |
| 146 | 147 |
| 147 icon_view_ = new FixedBoundarySizeImageView(); | 148 icon_view_ = new FixedBoundarySizeImageView(); |
| 148 AddChildView(icon_view_); | 149 AddChildView(icon_view_); |
| 149 | 150 |
| 150 views::View* text_container = new views::View(); | 151 views::View* text_container = new views::View(); |
| 151 views::BoxLayout* text_container_layout = | 152 views::BoxLayout* text_container_layout = |
| 152 new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0); | 153 new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0); |
| 153 text_container_layout->set_main_axis_alignment( | 154 text_container_layout->set_main_axis_alignment( |
| 154 views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER); | 155 views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER); |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 291 | 292 |
| 292 bool CloseAppDialogViewAndConfirmForTest(bool confirm) { | 293 bool CloseAppDialogViewAndConfirmForTest(bool confirm) { |
| 293 if (!g_current_arc_app_dialog_view) | 294 if (!g_current_arc_app_dialog_view) |
| 294 return false; | 295 return false; |
| 295 | 296 |
| 296 g_current_arc_app_dialog_view->ConfirmOrCancelForTest(confirm); | 297 g_current_arc_app_dialog_view->ConfirmOrCancelForTest(confirm); |
| 297 return true; | 298 return true; |
| 298 } | 299 } |
| 299 | 300 |
| 300 } // namespace arc | 301 } // namespace arc |
| OLD | NEW |