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

Side by Side Diff: ui/views/views_delegate.cc

Issue 2660553005: Harmony - convert hung renderer dialog. (Closed)
Patch Set: remove test friends 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "ui/views/views_delegate.h" 5 #include "ui/views/views_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "ui/views/layout/layout_constants.h" 9 #include "ui/views/layout/layout_constants.h"
10 #include "ui/views/views_touch_selection_controller_factory.h" 10 #include "ui/views/views_touch_selection_controller_factory.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 } 132 }
133 133
134 int ViewsDelegate::GetDialogRelatedButtonHorizontalSpacing() { 134 int ViewsDelegate::GetDialogRelatedButtonHorizontalSpacing() {
135 return kRelatedButtonHSpacing; 135 return kRelatedButtonHSpacing;
136 } 136 }
137 137
138 int ViewsDelegate::GetDialogRelatedControlVerticalSpacing() { 138 int ViewsDelegate::GetDialogRelatedControlVerticalSpacing() {
139 return kRelatedControlVerticalSpacing; 139 return kRelatedControlVerticalSpacing;
140 } 140 }
141 141
142 int ViewsDelegate::GetDialogButtonMinimumWidth() {
143 return kDialogMinimumButtonWidth;
144 }
145
142 gfx::Insets ViewsDelegate::GetDialogFrameViewInsets() { 146 gfx::Insets ViewsDelegate::GetDialogFrameViewInsets() {
143 return gfx::Insets(kPanelVertMargin, kButtonHEdgeMarginNew, 0, 147 return gfx::Insets(kPanelVertMargin, kButtonHEdgeMarginNew, 0,
144 kButtonHEdgeMarginNew); 148 kButtonHEdgeMarginNew);
145 } 149 }
146 150
147 gfx::Insets ViewsDelegate::GetBubbleDialogMargins() { 151 gfx::Insets ViewsDelegate::GetBubbleDialogMargins() {
148 return gfx::Insets(kPanelVertMargin, kPanelHorizMargin); 152 return gfx::Insets(kPanelVertMargin, kPanelHorizMargin);
149 } 153 }
150 154
151 ViewsDelegate::ViewsDelegate() 155 ViewsDelegate::ViewsDelegate()
152 : views_tsc_factory_(new ViewsTouchEditingControllerFactory) { 156 : views_tsc_factory_(new ViewsTouchEditingControllerFactory) {
153 DCHECK(!views_delegate); 157 DCHECK(!views_delegate);
154 views_delegate = this; 158 views_delegate = this;
155 159
156 ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get()); 160 ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get());
157 161
158 #if defined(USE_AURA) 162 #if defined(USE_AURA)
159 touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews()); 163 touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews());
160 #endif 164 #endif
161 } 165 }
162 166
163 } // namespace views 167 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698