| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bookmarks/bookmark_bubble_view.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" |
| 6 | 6 |
| 7 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "ui/views/controls/combobox/combobox.h" | 27 #include "ui/views/controls/combobox/combobox.h" |
| 28 #include "ui/views/controls/label.h" | 28 #include "ui/views/controls/label.h" |
| 29 #include "ui/views/controls/link.h" | 29 #include "ui/views/controls/link.h" |
| 30 #include "ui/views/controls/textfield/textfield.h" | 30 #include "ui/views/controls/textfield/textfield.h" |
| 31 #include "ui/views/layout/grid_layout.h" | 31 #include "ui/views/layout/grid_layout.h" |
| 32 #include "ui/views/layout/layout_constants.h" | 32 #include "ui/views/layout/layout_constants.h" |
| 33 #include "ui/views/widget/widget.h" | 33 #include "ui/views/widget/widget.h" |
| 34 | 34 |
| 35 using base::UserMetricsAction; | 35 using base::UserMetricsAction; |
| 36 using bookmarks::BookmarkModel; | 36 using bookmarks::BookmarkModel; |
| 37 using bookmarks::BookmarkNode; |
| 37 using views::ColumnSet; | 38 using views::ColumnSet; |
| 38 using views::GridLayout; | 39 using views::GridLayout; |
| 39 | 40 |
| 40 namespace { | 41 namespace { |
| 41 | 42 |
| 42 // Width of the border of a button. | 43 // Width of the border of a button. |
| 43 const int kControlBorderWidth = 2; | 44 const int kControlBorderWidth = 2; |
| 44 | 45 |
| 45 // This combobox prevents any lengthy content from stretching the bubble view. | 46 // This combobox prevents any lengthy content from stretching the bubble view. |
| 46 class UnsizedCombobox : public views::Combobox { | 47 class UnsizedCombobox : public views::Combobox { |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 if (node) { | 370 if (node) { |
| 370 const base::string16 new_title = title_tf_->text(); | 371 const base::string16 new_title = title_tf_->text(); |
| 371 if (new_title != node->GetTitle()) { | 372 if (new_title != node->GetTitle()) { |
| 372 model->SetTitle(node, new_title); | 373 model->SetTitle(node, new_title); |
| 373 content::RecordAction( | 374 content::RecordAction( |
| 374 UserMetricsAction("BookmarkBubble_ChangeTitleInBubble")); | 375 UserMetricsAction("BookmarkBubble_ChangeTitleInBubble")); |
| 375 } | 376 } |
| 376 parent_model_.MaybeChangeParent(node, parent_combobox_->selected_index()); | 377 parent_model_.MaybeChangeParent(node, parent_combobox_->selected_index()); |
| 377 } | 378 } |
| 378 } | 379 } |
| OLD | NEW |