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

Side by Side Diff: ui/views/style/platform_style.cc

Issue 2151933002: DialogDelegate: allow platforms to prevent Cancel being default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit test for mac Created 4 years, 5 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
« no previous file with comments | « ui/views/style/platform_style.h ('k') | ui/views/style/platform_style_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ui/views/style/platform_style.h" 5 #include "ui/views/style/platform_style.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "ui/base/material_design/material_design_controller.h" 9 #include "ui/base/material_design/material_design_controller.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 20 matching lines...) Expand all
31 #endif 31 #endif
32 32
33 } // namespace 33 } // namespace
34 34
35 #if !defined(OS_MACOSX) 35 #if !defined(OS_MACOSX)
36 36
37 const int PlatformStyle::kComboboxNormalArrowPadding = 7; 37 const int PlatformStyle::kComboboxNormalArrowPadding = 7;
38 const int PlatformStyle::kMinLabelButtonWidth = 70; 38 const int PlatformStyle::kMinLabelButtonWidth = 70;
39 const int PlatformStyle::kMinLabelButtonHeight = 33; 39 const int PlatformStyle::kMinLabelButtonHeight = 33;
40 const bool PlatformStyle::kDefaultLabelButtonHasBoldFont = true; 40 const bool PlatformStyle::kDefaultLabelButtonHasBoldFont = true;
41 const bool PlatformStyle::kDialogDefaultButtonCanBeCancel = true;
41 const bool PlatformStyle::kTextfieldDragVerticallyDragsToEnd = false; 42 const bool PlatformStyle::kTextfieldDragVerticallyDragsToEnd = false;
42 const CustomButton::NotifyAction PlatformStyle::kMenuNotifyActivationAction = 43 const CustomButton::NotifyAction PlatformStyle::kMenuNotifyActivationAction =
43 CustomButton::NOTIFY_ON_RELEASE; 44 CustomButton::NOTIFY_ON_RELEASE;
44 45
45 // static 46 // static
46 gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled, 47 gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled,
47 Combobox::Style style) { 48 Combobox::Style style) {
48 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 49 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
49 return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW); 50 return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW);
50 } 51 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 110
110 #if !defined(DESKTOP_LINUX) 111 #if !defined(DESKTOP_LINUX)
111 // static 112 // static
112 std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( 113 std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
113 LabelButton* button) { 114 LabelButton* button) {
114 return button->CreateDefaultBorder(); 115 return button->CreateDefaultBorder();
115 } 116 }
116 #endif 117 #endif
117 118
118 } // namespace views 119 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/style/platform_style.h ('k') | ui/views/style/platform_style_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698