OLD | NEW |
1 // Copyright (c) 2010 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/views/bookmark_bubble_view.h" | 5 #include "chrome/browser/ui/views/bookmark_bubble_view.h" |
6 | 6 |
7 #include "app/keyboard_codes.h" | 7 #include "app/keyboard_codes.h" |
8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
9 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
10 #include "base/string16.h" | 10 #include "base/string16.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "chrome/app/chrome_command_ids.h" | 13 #include "chrome/app/chrome_command_ids.h" |
14 #include "chrome/browser/bookmarks/bookmark_editor.h" | 14 #include "chrome/browser/bookmarks/bookmark_editor.h" |
15 #include "chrome/browser/bookmarks/bookmark_model.h" | 15 #include "chrome/browser/bookmarks/bookmark_model.h" |
16 #include "chrome/browser/bookmarks/bookmark_utils.h" | 16 #include "chrome/browser/bookmarks/bookmark_utils.h" |
17 #include "chrome/browser/metrics/user_metrics.h" | 17 #include "chrome/browser/metrics/user_metrics.h" |
18 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/views/info_bubble.h" | 19 #include "chrome/browser/ui/views/info_bubble.h" |
20 #include "chrome/common/notification_service.h" | 20 #include "chrome/common/notification_service.h" |
21 #include "gfx/canvas.h" | 21 #include "gfx/canvas.h" |
22 #include "gfx/color_utils.h" | 22 #include "gfx/color_utils.h" |
23 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
24 #include "grit/theme_resources.h" | 24 #include "grit/theme_resources.h" |
25 #include "views/event.h" | 25 #include "views/event.h" |
26 #include "views/standard_layout.h" | 26 #include "views/standard_layout.h" |
27 #include "views/controls/button/native_button.h" | 27 #include "views/controls/button/native_button.h" |
28 #include "views/controls/textfield/textfield.h" | 28 #include "views/controls/textfield/textfield.h" |
29 #include "views/focus/focus_manager.h" | 29 #include "views/focus/focus_manager.h" |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
408 const BookmarkNode* new_parent = | 408 const BookmarkNode* new_parent = |
409 parent_model_.GetNodeAt(parent_combobox_->selected_item()); | 409 parent_model_.GetNodeAt(parent_combobox_->selected_item()); |
410 if (new_parent != node->GetParent()) { | 410 if (new_parent != node->GetParent()) { |
411 UserMetrics::RecordAction( | 411 UserMetrics::RecordAction( |
412 UserMetricsAction("BookmarkBubble_ChangeParent"), profile_); | 412 UserMetricsAction("BookmarkBubble_ChangeParent"), profile_); |
413 model->Move(node, new_parent, new_parent->GetChildCount()); | 413 model->Move(node, new_parent, new_parent->GetChildCount()); |
414 } | 414 } |
415 } | 415 } |
416 } | 416 } |
417 } | 417 } |
OLD | NEW |