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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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>
11 11
12 #include "app/l10n_util.h" 12 #include "app/l10n_util.h"
13 #include "app/resource_bundle.h"
14 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/browser_list.h" 14 #include "chrome/browser/browser_list.h"
16 #include "chrome/browser/google/google_util.h" 15 #include "chrome/browser/google/google_util.h"
17 #include "chrome/browser/platform_util.h" 16 #include "chrome/browser/platform_util.h"
18 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/ui/gtk/cairo_cached_surface.h" 18 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
20 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" 19 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
21 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 20 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
22 #include "chrome/browser/ui/gtk/gtk_util.h" 21 #include "chrome/browser/ui/gtk/gtk_util.h"
23 #include "chrome/common/chrome_constants.h" 22 #include "chrome/common/chrome_constants.h"
24 #include "chrome/common/chrome_version_info.h" 23 #include "chrome/common/chrome_version_info.h"
25 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
26 #include "grit/chromium_strings.h" 25 #include "grit/chromium_strings.h"
27 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
28 #include "grit/locale_settings.h" 27 #include "grit/locale_settings.h"
29 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
29 #include "ui/base/resource/resource_bundle.h"
30 #include "webkit/glue/webkit_glue.h" 30 #include "webkit/glue/webkit_glue.h"
31 31
32 namespace { 32 namespace {
33 33
34 // Left or right margin. 34 // Left or right margin.
35 const int kPanelHorizMargin = 13; 35 const int kPanelHorizMargin = 13;
36 36
37 // Top or bottom margin. 37 // Top or bottom margin.
38 const int kPanelVertMargin = 20; 38 const int kPanelVertMargin = 20;
39 39
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 gtk_util::kContentAreaBorder, 0, 284 gtk_util::kContentAreaBorder, 0,
285 gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder); 285 gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder);
286 gtk_container_add(GTK_CONTAINER(alignment), vbox); 286 gtk_container_add(GTK_CONTAINER(alignment), vbox);
287 gtk_box_pack_start(GTK_BOX(content_area), alignment, FALSE, FALSE, 0); 287 gtk_box_pack_start(GTK_BOX(content_area), alignment, FALSE, FALSE, 0);
288 288
289 g_signal_connect(dialog, "response", G_CALLBACK(OnDialogResponse), NULL); 289 g_signal_connect(dialog, "response", G_CALLBACK(OnDialogResponse), NULL);
290 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 290 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
291 gtk_widget_show_all(dialog); 291 gtk_widget_show_all(dialog);
292 gtk_widget_grab_focus(close_button); 292 gtk_widget_grab_focus(close_button);
293 } 293 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm ('k') | chrome/browser/ui/gtk/bookmark_bar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698