OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/bookmark_bubble_view.h" |
6 | 6 |
| 7 #include "app/l10n_util.h" |
7 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
8 #include "chrome/app/chrome_dll_resource.h" | 9 #include "chrome/app/chrome_dll_resource.h" |
9 #include "chrome/browser/bookmarks/bookmark_editor.h" | 10 #include "chrome/browser/bookmarks/bookmark_editor.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/bookmarks/bookmark_utils.h" |
12 #include "chrome/browser/metrics/user_metrics.h" | 13 #include "chrome/browser/metrics/user_metrics.h" |
13 #include "chrome/browser/profile.h" | 14 #include "chrome/browser/profile.h" |
14 #include "chrome/browser/views/info_bubble.h" | 15 #include "chrome/browser/views/info_bubble.h" |
15 #include "chrome/browser/views/standard_layout.h" | 16 #include "chrome/browser/views/standard_layout.h" |
16 #include "chrome/common/gfx/chrome_canvas.h" | 17 #include "chrome/common/gfx/chrome_canvas.h" |
17 #include "chrome/common/l10n_util.h" | |
18 #include "chrome/common/notification_service.h" | 18 #include "chrome/common/notification_service.h" |
19 #include "chrome/views/controls/button/native_button.h" | 19 #include "chrome/views/controls/button/native_button.h" |
20 #include "chrome/views/controls/text_field.h" | 20 #include "chrome/views/controls/text_field.h" |
21 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
22 #include "grit/theme_resources.h" | 22 #include "grit/theme_resources.h" |
23 | 23 |
24 using views::ComboBox; | 24 using views::ComboBox; |
25 using views::ColumnSet; | 25 using views::ColumnSet; |
26 using views::GridLayout; | 26 using views::GridLayout; |
27 using views::Label; | 27 using views::Label; |
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 parent_model_.GetItemCount(parent_combobox_) - 1) { | 397 parent_model_.GetItemCount(parent_combobox_) - 1) { |
398 BookmarkNode* new_parent = | 398 BookmarkNode* new_parent = |
399 parent_model_.GetNodeAt(parent_combobox_->GetSelectedItem()); | 399 parent_model_.GetNodeAt(parent_combobox_->GetSelectedItem()); |
400 if (new_parent != node->GetParent()) { | 400 if (new_parent != node->GetParent()) { |
401 UserMetrics::RecordAction(L"BookmarkBubble_ChangeParent", profile_); | 401 UserMetrics::RecordAction(L"BookmarkBubble_ChangeParent", profile_); |
402 model->Move(node, new_parent, new_parent->GetChildCount()); | 402 model->Move(node, new_parent, new_parent->GetChildCount()); |
403 } | 403 } |
404 } | 404 } |
405 } | 405 } |
406 } | 406 } |
OLD | NEW |