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

Side by Side Diff: chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 <gtk/gtk.h> 5 #include <gtk/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/net/url_fixer_upper.h" 9 #include "chrome/browser/net/url_fixer_upper.h"
10 #include "chrome/browser/possible_url_model.h" 10 #include "chrome/browser/possible_url_model.h"
11 #include "chrome/browser/prefs/pref_service.h" 11 #include "chrome/browser/prefs/pref_service.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" 13 #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
14 #include "chrome/browser/ui/gtk/gtk_tree.h" 14 #include "chrome/browser/ui/gtk/gtk_tree.h"
15 #include "chrome/browser/ui/gtk/gtk_util.h" 15 #include "chrome/browser/ui/gtk/gtk_util.h"
16 #include "chrome/browser/ui/gtk/options/url_picker_dialog_gtk.h" 16 #include "chrome/browser/ui/gtk/options/url_picker_dialog_gtk.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "gfx/gtk_util.h"
19 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
20 #include "grit/chromium_strings.h" 19 #include "grit/chromium_strings.h"
21 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
22 #include "grit/locale_settings.h" 21 #include "grit/locale_settings.h"
23 #include "net/base/net_util.h" 22 #include "net/base/net_util.h"
24 #include "third_party/skia/include/core/SkBitmap.h" 23 #include "third_party/skia/include/core/SkBitmap.h"
25 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/gfx/gtk_util.h"
26 26
27 namespace { 27 namespace {
28 28
29 // Column ids for |history_list_store_|. 29 // Column ids for |history_list_store_|.
30 enum { 30 enum {
31 COL_FAVICON, 31 COL_FAVICON,
32 COL_TITLE, 32 COL_TITLE,
33 COL_DISPLAY_URL, 33 COL_DISPLAY_URL,
34 COL_COUNT, 34 COL_COUNT,
35 }; 35 };
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 267
268 void UrlPickerDialogGtk::OnResponse(GtkWidget* dialog, int response_id) { 268 void UrlPickerDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
269 if (response_id == GTK_RESPONSE_OK) 269 if (response_id == GTK_RESPONSE_OK)
270 AddURL(); 270 AddURL();
271 gtk_widget_destroy(dialog_); 271 gtk_widget_destroy(dialog_);
272 } 272 }
273 273
274 void UrlPickerDialogGtk::OnWindowDestroy(GtkWidget* widget) { 274 void UrlPickerDialogGtk::OnWindowDestroy(GtkWidget* widget) {
275 MessageLoop::current()->DeleteSoon(FROM_HERE, this); 275 MessageLoop::current()->DeleteSoon(FROM_HERE, this);
276 } 276 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698