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

Side by Side Diff: chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc

Issue 10933085: Update ConstrainedWindowViews appearance according to mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review updates Created 8 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/tab_modal_confirm_dialog_views.h" 5 #include "chrome/browser/ui/views/tab_modal_confirm_dialog_views.h"
6 6
7 #include "base/command_line.h"
7 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/ui/browser_dialogs.h" 9 #include "chrome/browser/ui/browser_dialogs.h"
9 #include "chrome/browser/ui/browser_list.h" 10 #include "chrome/browser/ui/browser_list.h"
10 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/browser/ui/tab_contents/tab_contents.h" 12 #include "chrome/browser/ui/tab_contents/tab_contents.h"
12 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" 13 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
13 #include "chrome/browser/ui/views/constrained_window_views.h" 14 #include "chrome/browser/ui/views/constrained_window_views.h"
15 #include "chrome/common/chrome_switches.h"
14 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
15 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/views/controls/message_box_view.h" 18 #include "ui/views/controls/message_box_view.h"
19 #include "ui/views/window/dialog_client_view.h"
17 20
18 namespace chrome { 21 namespace chrome {
19 22
20 // Declared in browser_dialogs.h so others don't have to depend on our header. 23 // Declared in browser_dialogs.h so others don't have to depend on our header.
21 void ShowTabModalConfirmDialog(TabModalConfirmDialogDelegate* delegate, 24 void ShowTabModalConfirmDialog(TabModalConfirmDialogDelegate* delegate,
22 TabContents* tab_contents) { 25 TabContents* tab_contents) {
23 new TabModalConfirmDialogViews(delegate, tab_contents); 26 new TabModalConfirmDialogViews(delegate, tab_contents);
24 } 27 }
25 28
26 } // namespace chrome 29 } // namespace chrome
27 30
31 namespace {
32 const int kChromeStyleUniformInset = 0;
33 const int kChromeStyleInterRowVerticalSpacing = 20;
34
35 const int kChromeStyleButtonVEdgeMargin = 0;
36 const int kChromeStyleButtonHEdgeMargin = 0;
37 const int kChromeStyleDialogButtonLabelSpacing = 24;
38
39 views::MessageBoxView::InitParams CreateMessageBoxViewInitParams(
40 const string16& message)
41 {
42 views::MessageBoxView::InitParams params(message);
43
44 CommandLine* command_line = CommandLine::ForCurrentProcess();
45 if (command_line->HasSwitch(switches::kEnableFramelessConstrainedDialogs)) {
46 params.top_inset = kChromeStyleUniformInset;
47 params.bottom_inset = kChromeStyleUniformInset;
48 params.left_inset = kChromeStyleUniformInset;
49 params.right_inset = kChromeStyleUniformInset;
50
51 params.inter_row_vertical_spacing = kChromeStyleInterRowVerticalSpacing;
52 }
53
54 return params;
55 }
56 } // namespace
57
28 ////////////////////////////////////////////////////////////////////////////// 58 //////////////////////////////////////////////////////////////////////////////
29 // TabModalConfirmDialogViews, constructor & destructor: 59 // TabModalConfirmDialogViews, constructor & destructor:
30 60
31 TabModalConfirmDialogViews::TabModalConfirmDialogViews( 61 TabModalConfirmDialogViews::TabModalConfirmDialogViews(
32 TabModalConfirmDialogDelegate* delegate, 62 TabModalConfirmDialogDelegate* delegate,
33 TabContents* tab_contents) 63 TabContents* tab_contents)
34 : delegate_(delegate), 64 : delegate_(delegate),
35 message_box_view_(new views::MessageBoxView( 65 message_box_view_(new views::MessageBoxView(
36 views::MessageBoxView::InitParams(delegate->GetMessage()))) { 66 CreateMessageBoxViewInitParams(delegate->GetMessage()))) {
37 delegate_->set_window(new ConstrainedWindowViews(tab_contents, this)); 67 delegate_->set_window(new ConstrainedWindowViews(tab_contents, this));
38 } 68 }
39 69
40 TabModalConfirmDialogViews::~TabModalConfirmDialogViews() { 70 TabModalConfirmDialogViews::~TabModalConfirmDialogViews() {
41 } 71 }
42 72
43 ////////////////////////////////////////////////////////////////////////////// 73 //////////////////////////////////////////////////////////////////////////////
44 // TabModalConfirmDialogViews, views::DialogDelegate implementation: 74 // TabModalConfirmDialogViews, views::DialogDelegate implementation:
45 75
46 string16 TabModalConfirmDialogViews::GetWindowTitle() const { 76 string16 TabModalConfirmDialogViews::GetWindowTitle() const {
(...skipping 12 matching lines...) Expand all
59 bool TabModalConfirmDialogViews::Cancel() { 89 bool TabModalConfirmDialogViews::Cancel() {
60 delegate_->Cancel(); 90 delegate_->Cancel();
61 return true; 91 return true;
62 } 92 }
63 93
64 bool TabModalConfirmDialogViews::Accept() { 94 bool TabModalConfirmDialogViews::Accept() {
65 delegate_->Accept(); 95 delegate_->Accept();
66 return true; 96 return true;
67 } 97 }
68 98
99 views::ClientView* TabModalConfirmDialogViews::CreateClientView(
100 views::Widget* widget) {
101 CommandLine* command_line = CommandLine::ForCurrentProcess();
102 if (command_line->HasSwitch(switches::kEnableFramelessConstrainedDialogs)) {
103 views::DialogClientView::StyleParams params;
104 params.button_vedge_margin = kChromeStyleButtonVEdgeMargin;
105 params.button_hedge_margin = kChromeStyleButtonHEdgeMargin;
106 params.button_label_spacing = kChromeStyleDialogButtonLabelSpacing;
107 params.text_button_factory =
108 &views::DialogClientView::CreateChromeStyleDialogButton;
109
110 return new views::DialogClientView(widget, GetContentsView(), params);
111 }
112
113 return DialogDelegate::CreateClientView(widget);
114 }
115
69 /////////////////////////////////////////////////////////////////////////////// 116 ///////////////////////////////////////////////////////////////////////////////
70 // TabModalConfirmDialogViews, views::WidgetDelegate implementation: 117 // TabModalConfirmDialogViews, views::WidgetDelegate implementation:
71 118
72 views::View* TabModalConfirmDialogViews::GetContentsView() { 119 views::View* TabModalConfirmDialogViews::GetContentsView() {
73 return message_box_view_; 120 return message_box_view_;
74 } 121 }
75 122
76 views::Widget* TabModalConfirmDialogViews::GetWidget() { 123 views::Widget* TabModalConfirmDialogViews::GetWidget() {
77 return message_box_view_->GetWidget(); 124 return message_box_view_->GetWidget();
78 } 125 }
79 126
80 const views::Widget* TabModalConfirmDialogViews::GetWidget() const { 127 const views::Widget* TabModalConfirmDialogViews::GetWidget() const {
81 return message_box_view_->GetWidget(); 128 return message_box_view_->GetWidget();
82 } 129 }
83 130
84 void TabModalConfirmDialogViews::DeleteDelegate() { 131 void TabModalConfirmDialogViews::DeleteDelegate() {
85 delete this; 132 delete this;
86 } 133 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698