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

Side by Side Diff: chrome/browser/ui/views/bookmark_bubble_view.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/views/bookmark_bubble_view.h" 5 #include "chrome/browser/ui/views/bookmark_bubble_view.h"
6 6
7 #include "base/string16.h" 7 #include "base/string16.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/browser/bookmarks/bookmark_editor.h" 11 #include "chrome/browser/bookmarks/bookmark_editor.h"
12 #include "chrome/browser/bookmarks/bookmark_model.h" 12 #include "chrome/browser/bookmarks/bookmark_model.h"
13 #include "chrome/browser/bookmarks/bookmark_utils.h" 13 #include "chrome/browser/bookmarks/bookmark_utils.h"
14 #include "chrome/browser/metrics/user_metrics.h" 14 #include "chrome/browser/metrics/user_metrics.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/views/info_bubble.h" 16 #include "chrome/browser/ui/views/info_bubble.h"
17 #include "chrome/common/notification_service.h" 17 #include "chrome/common/notification_service.h"
18 #include "gfx/canvas.h"
19 #include "gfx/color_utils.h"
20 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
21 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
22 #include "ui/base/keycodes/keyboard_codes.h" 20 #include "ui/base/keycodes/keyboard_codes.h"
23 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
23 #include "ui/gfx/canvas.h"
24 #include "ui/gfx/color_utils.h"
25 #include "views/controls/button/native_button.h" 25 #include "views/controls/button/native_button.h"
26 #include "views/controls/textfield/textfield.h" 26 #include "views/controls/textfield/textfield.h"
27 #include "views/event.h" 27 #include "views/event.h"
28 #include "views/focus/focus_manager.h" 28 #include "views/focus/focus_manager.h"
29 #include "views/layout/grid_layout.h" 29 #include "views/layout/grid_layout.h"
30 #include "views/layout/layout_constants.h" 30 #include "views/layout/layout_constants.h"
31 #include "views/window/client_view.h" 31 #include "views/window/client_view.h"
32 #include "views/window/window.h" 32 #include "views/window/window.h"
33 33
34 using views::Combobox; 34 using views::Combobox;
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 const BookmarkNode* new_parent = 417 const BookmarkNode* new_parent =
418 parent_model_.GetNodeAt(parent_combobox_->selected_item()); 418 parent_model_.GetNodeAt(parent_combobox_->selected_item());
419 if (new_parent != node->GetParent()) { 419 if (new_parent != node->GetParent()) {
420 UserMetrics::RecordAction( 420 UserMetrics::RecordAction(
421 UserMetricsAction("BookmarkBubble_ChangeParent"), profile_); 421 UserMetricsAction("BookmarkBubble_ChangeParent"), profile_);
422 model->Move(node, new_parent, new_parent->GetChildCount()); 422 model->Move(node, new_parent, new_parent->GetChildCount());
423 } 423 }
424 } 424 }
425 } 425 }
426 } 426 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmark_bubble_view.h ('k') | chrome/browser/ui/views/bookmark_context_menu_controller_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698