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

Side by Side Diff: ui/views/views_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
« no previous file with comments | « ui/views/views_delegate.h ('k') | ui/views/window/dialog_client_view.h » ('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 (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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 gfx::Insets ViewsDelegate::GetDialogFrameViewInsets() const { 146 gfx::Insets ViewsDelegate::GetDialogFrameViewInsets() const {
147 return gfx::Insets(kPanelVertMargin, kButtonHEdgeMarginNew, 0, 147 return gfx::Insets(kPanelVertMargin, kButtonHEdgeMarginNew, 0,
148 kButtonHEdgeMarginNew); 148 kButtonHEdgeMarginNew);
149 } 149 }
150 150
151 gfx::Insets ViewsDelegate::GetBubbleDialogMargins() const { 151 gfx::Insets ViewsDelegate::GetBubbleDialogMargins() const {
152 return gfx::Insets(kPanelVertMargin, kPanelHorizMargin); 152 return gfx::Insets(kPanelVertMargin, kPanelHorizMargin);
153 } 153 }
154 154
155 int ViewsDelegate::GetDialogButtonMinimumWidth() const {
156 return kDialogMinimumButtonWidth;
157 }
158
159 int ViewsDelegate::GetButtonHorizontalPadding() const {
160 return 0;
161 }
162
155 ViewsDelegate::ViewsDelegate() 163 ViewsDelegate::ViewsDelegate()
156 : views_tsc_factory_(new ViewsTouchEditingControllerFactory) { 164 : views_tsc_factory_(new ViewsTouchEditingControllerFactory) {
157 DCHECK(!views_delegate); 165 DCHECK(!views_delegate);
158 views_delegate = this; 166 views_delegate = this;
159 167
160 ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get()); 168 ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get());
161 169
162 #if defined(USE_AURA) 170 #if defined(USE_AURA)
163 touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews()); 171 touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews());
164 #endif 172 #endif
165 } 173 }
166 174
167 } // namespace views 175 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/views_delegate.h ('k') | ui/views/window/dialog_client_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698