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

Side by Side Diff: chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc

Issue 11111022: Remove TabContents from constrained windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unrelated gtk code Created 8 years, 2 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/gtk/tab_modal_confirm_dialog_gtk.h" 5 #include "chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/ui/browser_dialogs.h" 9 #include "chrome/browser/ui/browser_dialogs.h"
10 #include "chrome/browser/ui/tab_contents/tab_contents.h" 10 #include "chrome/browser/ui/tab_contents/tab_contents.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 ok_ = gtk_button_new_with_label( 64 ok_ = gtk_button_new_with_label(
65 UTF16ToUTF8(delegate->GetAcceptButtonTitle()).c_str()); 65 UTF16ToUTF8(delegate->GetAcceptButtonTitle()).c_str());
66 const char* accept_button_icon_id = delegate->GetAcceptButtonIcon(); 66 const char* accept_button_icon_id = delegate->GetAcceptButtonIcon();
67 if (accept_button_icon_id) { 67 if (accept_button_icon_id) {
68 gtk_button_set_image(GTK_BUTTON(ok_), gtk_image_new_from_stock( 68 gtk_button_set_image(GTK_BUTTON(ok_), gtk_image_new_from_stock(
69 accept_button_icon_id, GTK_ICON_SIZE_BUTTON)); 69 accept_button_icon_id, GTK_ICON_SIZE_BUTTON));
70 } 70 }
71 g_signal_connect(ok_, "clicked", G_CALLBACK(OnAcceptThunk), this); 71 g_signal_connect(ok_, "clicked", G_CALLBACK(OnAcceptThunk), this);
72 gtk_box_pack_end(GTK_BOX(buttonBox), ok_, FALSE, TRUE, 0); 72 gtk_box_pack_end(GTK_BOX(buttonBox), ok_, FALSE, TRUE, 0);
73 73
74 delegate->set_window(new ConstrainedWindowGtk(tab_contents, this)); 74 delegate->set_window(
75 new ConstrainedWindowGtk(tab_contents->web_contents(), this));
75 } 76 }
76 77
77 GtkWidget* TabModalConfirmDialogGtk::GetWidgetRoot() { 78 GtkWidget* TabModalConfirmDialogGtk::GetWidgetRoot() {
78 return dialog_; 79 return dialog_;
79 } 80 }
80 81
81 GtkWidget* TabModalConfirmDialogGtk::GetFocusWidget() { 82 GtkWidget* TabModalConfirmDialogGtk::GetFocusWidget() {
82 return cancel_; 83 return cancel_;
83 } 84 }
84 85
(...skipping 13 matching lines...) Expand all
98 OnCancel(NULL); 99 OnCancel(NULL);
99 } 100 }
100 101
101 void TabModalConfirmDialogGtk::OnAccept(GtkWidget* widget) { 102 void TabModalConfirmDialogGtk::OnAccept(GtkWidget* widget) {
102 delegate_->Accept(); 103 delegate_->Accept();
103 } 104 }
104 105
105 void TabModalConfirmDialogGtk::OnCancel(GtkWidget* widget) { 106 void TabModalConfirmDialogGtk::OnCancel(GtkWidget* widget) {
106 delegate_->Cancel(); 107 delegate_->Cancel();
107 } 108 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/ssl_client_certificate_selector.cc ('k') | chrome/browser/ui/gtk/web_intent_picker_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698