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

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: Button layout and appearance 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 kWebStyleUniformInset = 0;
33 const int kWebStyleInterRowVerticalSpacing = 20;
34
35 views::MessageBoxView::InitParams CreateMessageBoxViewInitParams(
36 const string16& message)
37 {
38 views::MessageBoxView::InitParams params(message);
39
40 CommandLine* command_line = CommandLine::ForCurrentProcess();
41 if (command_line->HasSwitch(switches::kEnableFramelessConstrainedDialogs)) {
42 params.top_inset = kWebStyleUniformInset;
43 params.bottom_inset = kWebStyleUniformInset;
44 params.left_inset = kWebStyleUniformInset;
45 params.right_inset = kWebStyleUniformInset;
46
47 params.inter_row_vertical_spacing = kWebStyleInterRowVerticalSpacing;
48 }
49
50 return params;
51 }
52 } // namespace
53
28 ////////////////////////////////////////////////////////////////////////////// 54 //////////////////////////////////////////////////////////////////////////////
29 // TabModalConfirmDialogViews, constructor & destructor: 55 // TabModalConfirmDialogViews, constructor & destructor:
30 56
31 TabModalConfirmDialogViews::TabModalConfirmDialogViews( 57 TabModalConfirmDialogViews::TabModalConfirmDialogViews(
32 TabModalConfirmDialogDelegate* delegate, 58 TabModalConfirmDialogDelegate* delegate,
33 TabContents* tab_contents) 59 TabContents* tab_contents)
34 : delegate_(delegate), 60 : delegate_(delegate),
35 message_box_view_(new views::MessageBoxView( 61 message_box_view_(new views::MessageBoxView(
36 views::MessageBoxView::InitParams(delegate->GetMessage()))) { 62 CreateMessageBoxViewInitParams(delegate->GetMessage()))) {
37 delegate_->set_window(new ConstrainedWindowViews(tab_contents, this)); 63 delegate_->set_window(new ConstrainedWindowViews(tab_contents, this));
38 } 64 }
39 65
40 TabModalConfirmDialogViews::~TabModalConfirmDialogViews() { 66 TabModalConfirmDialogViews::~TabModalConfirmDialogViews() {
41 } 67 }
42 68
43 ////////////////////////////////////////////////////////////////////////////// 69 //////////////////////////////////////////////////////////////////////////////
44 // TabModalConfirmDialogViews, views::DialogDelegate implementation: 70 // TabModalConfirmDialogViews, views::DialogDelegate implementation:
45 71
46 string16 TabModalConfirmDialogViews::GetWindowTitle() const { 72 string16 TabModalConfirmDialogViews::GetWindowTitle() const {
(...skipping 12 matching lines...) Expand all
59 bool TabModalConfirmDialogViews::Cancel() { 85 bool TabModalConfirmDialogViews::Cancel() {
60 delegate_->Cancel(); 86 delegate_->Cancel();
61 return true; 87 return true;
62 } 88 }
63 89
64 bool TabModalConfirmDialogViews::Accept() { 90 bool TabModalConfirmDialogViews::Accept() {
65 delegate_->Accept(); 91 delegate_->Accept();
66 return true; 92 return true;
67 } 93 }
68 94
95 views::ClientView* TabModalConfirmDialogViews::CreateClientView(
96 views::Widget* widget) {
97 CommandLine* command_line = CommandLine::ForCurrentProcess();
98 if (command_line->HasSwitch(switches::kEnableFramelessConstrainedDialogs))
99 return new views::DialogClientView(
100 widget, GetContentsView(), views::DialogClientView::STYLE_WEB);
101
102 return DialogDelegate::CreateClientView(widget);
103 }
104
69 /////////////////////////////////////////////////////////////////////////////// 105 ///////////////////////////////////////////////////////////////////////////////
70 // TabModalConfirmDialogViews, views::WidgetDelegate implementation: 106 // TabModalConfirmDialogViews, views::WidgetDelegate implementation:
71 107
72 views::View* TabModalConfirmDialogViews::GetContentsView() { 108 views::View* TabModalConfirmDialogViews::GetContentsView() {
73 return message_box_view_; 109 return message_box_view_;
74 } 110 }
75 111
76 views::Widget* TabModalConfirmDialogViews::GetWidget() { 112 views::Widget* TabModalConfirmDialogViews::GetWidget() {
77 return message_box_view_->GetWidget(); 113 return message_box_view_->GetWidget();
78 } 114 }
79 115
80 const views::Widget* TabModalConfirmDialogViews::GetWidget() const { 116 const views::Widget* TabModalConfirmDialogViews::GetWidget() const {
81 return message_box_view_->GetWidget(); 117 return message_box_view_->GetWidget();
82 } 118 }
83 119
84 void TabModalConfirmDialogViews::DeleteDelegate() { 120 void TabModalConfirmDialogViews::DeleteDelegate() {
85 delete this; 121 delete this;
86 } 122 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698