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

Side by Side Diff: chrome/browser/ui/views/harmony/layout_delegate.cc

Issue 2660553005: Harmony - convert hung renderer dialog. (Closed)
Patch Set: disable dialog test on osx 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 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/views/harmony/layout_delegate.h" 5 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h" 9 #include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h"
10 #include "ui/base/material_design/material_design_controller.h" 10 #include "ui/base/material_design/material_design_controller.h"
11 #include "ui/views/layout/layout_constants.h" 11 #include "ui/views/layout/layout_constants.h"
12 12
13 static base::LazyInstance<LayoutDelegate> layout_delegate_ = 13 static base::LazyInstance<LayoutDelegate> layout_delegate_ =
14 LAZY_INSTANCE_INITIALIZER; 14 LAZY_INSTANCE_INITIALIZER;
15 15
16 // static 16 // static
17 LayoutDelegate* LayoutDelegate::Get() { 17 LayoutDelegate* LayoutDelegate::Get() {
18 return ui::MaterialDesignController::IsSecondaryUiMaterial() 18 return ui::MaterialDesignController::IsSecondaryUiMaterial()
19 ? HarmonyLayoutDelegate::Get() 19 ? HarmonyLayoutDelegate::Get()
20 : layout_delegate_.Pointer(); 20 : layout_delegate_.Pointer();
21 } 21 }
22 22
23 int LayoutDelegate::GetMetric(Metric metric) const { 23 int LayoutDelegate::GetMetric(Metric metric) const {
24 switch (metric) { 24 switch (metric) {
25 case Metric::BUTTON_HORIZONTAL_PADDING:
26 return 0;
25 case Metric::DIALOG_BUTTON_MARGIN: 27 case Metric::DIALOG_BUTTON_MARGIN:
26 return views::kButtonHEdgeMarginNew; 28 return views::kButtonHEdgeMarginNew;
29 case Metric::DIALOG_BUTTON_MINIMUM_WIDTH:
30 return views::kDialogMinimumButtonWidth;
27 case Metric::DIALOG_BUTTON_TOP_SPACING: 31 case Metric::DIALOG_BUTTON_TOP_SPACING:
28 return 0; 32 return 0;
29 case Metric::DIALOG_CLOSE_BUTTON_MARGIN: 33 case Metric::DIALOG_CLOSE_BUTTON_MARGIN:
30 return views::kCloseButtonMargin; 34 return views::kCloseButtonMargin;
31 case Metric::PANEL_CONTENT_MARGIN: 35 case Metric::PANEL_CONTENT_MARGIN:
32 return views::kPanelHorizMargin; 36 return views::kPanelHorizMargin;
33 case Metric::RELATED_BUTTON_HORIZONTAL_SPACING: 37 case Metric::RELATED_BUTTON_HORIZONTAL_SPACING:
34 return views::kRelatedButtonHSpacing; 38 return views::kRelatedButtonHSpacing;
35 case Metric::RELATED_CONTROL_HORIZONTAL_SPACING: 39 case Metric::RELATED_CONTROL_HORIZONTAL_SPACING:
36 return views::kRelatedControlHorizontalSpacing; 40 return views::kRelatedControlHorizontalSpacing;
37 case Metric::RELATED_CONTROL_VERTICAL_SPACING: 41 case Metric::RELATED_CONTROL_VERTICAL_SPACING:
38 return views::kRelatedControlVerticalSpacing; 42 return views::kRelatedControlVerticalSpacing;
39 case Metric::RELATED_LABEL_HORIZONTAL_SPACING: 43 case Metric::RELATED_LABEL_HORIZONTAL_SPACING:
40 return views::kItemLabelSpacing; 44 return views::kItemLabelSpacing;
41 case Metric::SUBSECTION_HORIZONTAL_INDENT: 45 case Metric::SUBSECTION_HORIZONTAL_INDENT:
42 return views::kCheckboxIndent; 46 return views::kCheckboxIndent;
47 case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING:
48 return views::kUnrelatedControlHorizontalSpacing;
49 case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING_LARGE:
50 return views::kUnrelatedControlLargeHorizontalSpacing;
43 case Metric::UNRELATED_CONTROL_VERTICAL_SPACING: 51 case Metric::UNRELATED_CONTROL_VERTICAL_SPACING:
44 return views::kUnrelatedControlVerticalSpacing; 52 return views::kUnrelatedControlVerticalSpacing;
45 case Metric::UNRELATED_CONTROL_VERTICAL_SPACING_LARGE: 53 case Metric::UNRELATED_CONTROL_VERTICAL_SPACING_LARGE:
46 return views::kUnrelatedControlLargeVerticalSpacing; 54 return views::kUnrelatedControlLargeVerticalSpacing;
47 } 55 }
48 NOTREACHED(); 56 NOTREACHED();
49 return 0; 57 return 0;
50 } 58 }
51 59
52 views::GridLayout::Alignment LayoutDelegate::GetControlLabelGridAlignment() 60 views::GridLayout::Alignment LayoutDelegate::GetControlLabelGridAlignment()
53 const { 61 const {
54 return views::GridLayout::TRAILING; 62 return views::GridLayout::TRAILING;
55 } 63 }
56 64
57 bool LayoutDelegate::UseExtraDialogPadding() const { 65 bool LayoutDelegate::UseExtraDialogPadding() const {
58 return true; 66 return true;
59 } 67 }
60 68
61 bool LayoutDelegate::IsHarmonyMode() const { 69 bool LayoutDelegate::IsHarmonyMode() const {
62 return false; 70 return false;
63 } 71 }
64 72
65 int LayoutDelegate::GetDialogPreferredWidth(DialogWidth width) const { 73 int LayoutDelegate::GetDialogPreferredWidth(DialogWidth width) const {
66 return 0; 74 return 0;
67 } 75 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/harmony/layout_delegate.h ('k') | chrome/browser/ui/views/hung_renderer_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698