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

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

Issue 8224023: Don't show URL for pending new navigations initiated by the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/about_chrome_dialog.h" 5 #include "chrome/browser/ui/gtk/about_chrome_dialog.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 g_free(markup); 62 g_free(markup);
63 63
64 // Left align it. 64 // Left align it.
65 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 65 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
66 66
67 return label; 67 return label;
68 } 68 }
69 69
70 void OnLinkButtonClick(GtkWidget* button, const char* url) { 70 void OnLinkButtonClick(GtkWidget* button, const char* url) {
71 BrowserList::GetLastActive()->OpenURL(OpenURLParams( 71 BrowserList::GetLastActive()->OpenURL(OpenURLParams(
72 GURL(url), GURL(), NEW_WINDOW, content::PAGE_TRANSITION_LINK)); 72 GURL(url), GURL(), NEW_WINDOW, content::PAGE_TRANSITION_LINK, false));
73 } 73 }
74 74
75 const char* GetChromiumUrl() { 75 const char* GetChromiumUrl() {
76 static GURL url = google_util::AppendGoogleLocaleParam( 76 static GURL url = google_util::AppendGoogleLocaleParam(
77 GURL(chrome::kChromiumProjectURL)); 77 GURL(chrome::kChromiumProjectURL));
78 return url.spec().c_str(); 78 return url.spec().c_str();
79 } 79 }
80 80
81 gboolean OnEventBoxExpose(GtkWidget* event_box, 81 gboolean OnEventBoxExpose(GtkWidget* event_box,
82 GdkEventExpose* expose, 82 GdkEventExpose* expose,
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 ui::kContentAreaBorder, 0, 270 ui::kContentAreaBorder, 0,
271 ui::kContentAreaBorder, ui::kContentAreaBorder); 271 ui::kContentAreaBorder, ui::kContentAreaBorder);
272 gtk_container_add(GTK_CONTAINER(alignment), vbox); 272 gtk_container_add(GTK_CONTAINER(alignment), vbox);
273 gtk_box_pack_start(GTK_BOX(content_area), alignment, FALSE, FALSE, 0); 273 gtk_box_pack_start(GTK_BOX(content_area), alignment, FALSE, FALSE, 0);
274 274
275 g_signal_connect(dialog, "response", G_CALLBACK(OnResponse), NULL); 275 g_signal_connect(dialog, "response", G_CALLBACK(OnResponse), NULL);
276 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 276 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
277 gtk_widget_show_all(dialog); 277 gtk_widget_show_all(dialog);
278 gtk_widget_grab_focus(close_button); 278 gtk_widget_grab_focus(close_button);
279 } 279 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698