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

Side by Side Diff: chrome/browser/ui/gtk/bookmark_utils_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 "chrome/browser/ui/gtk/bookmark_utils_gtk.h" 5 #include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
6 6
7 #include "base/pickle.h" 7 #include "base/pickle.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/bookmarks/bookmark_model.h" 11 #include "chrome/browser/bookmarks/bookmark_model.h"
12 #include "chrome/browser/bookmarks/bookmark_node_data.h" 12 #include "chrome/browser/bookmarks/bookmark_node_data.h"
13 #include "chrome/browser/bookmarks/bookmark_utils.h" 13 #include "chrome/browser/bookmarks/bookmark_utils.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/gtk/gtk_chrome_button.h" 15 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
16 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 16 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
17 #include "chrome/browser/ui/gtk/gtk_util.h" 17 #include "chrome/browser/ui/gtk/gtk_util.h"
18 #include "gfx/canvas_skia_paint.h"
19 #include "gfx/font.h"
20 #include "gfx/gtk_util.h"
21 #include "ui/base/dragdrop/gtk_dnd_util.h" 18 #include "ui/base/dragdrop/gtk_dnd_util.h"
22 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/gfx/canvas_skia_paint.h"
22 #include "ui/gfx/font.h"
23 #include "ui/gfx/gtk_util.h"
24 24
25 namespace { 25 namespace {
26 26
27 // Spacing between the favicon and the text. 27 // Spacing between the favicon and the text.
28 const int kBarButtonPadding = 4; 28 const int kBarButtonPadding = 4;
29 29
30 // Used in gtk_selection_data_set(). (I assume from this parameter that gtk has 30 // Used in gtk_selection_data_set(). (I assume from this parameter that gtk has
31 // to some really exotic hardware...) 31 // to some really exotic hardware...)
32 const int kBitsInAByte = 8; 32 const int kBitsInAByte = 8;
33 33
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 GURL url; 431 GURL url;
432 string16 title; 432 string16 title;
433 if (!ui::ExtractNetscapeURL(selection_data, &url, &title)) 433 if (!ui::ExtractNetscapeURL(selection_data, &url, &title))
434 return false; 434 return false;
435 435
436 model->AddURL(parent, idx, title, url); 436 model->AddURL(parent, idx, title, url);
437 return true; 437 return true;
438 } 438 }
439 439
440 } // namespace bookmark_utils 440 } // namespace bookmark_utils
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc ('k') | chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698