| 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/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" |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 | 229 |
| 230 layout->StartRow(0, 2); | 230 layout->StartRow(0, 2); |
| 231 layout->AddView(combobox_label); | 231 layout->AddView(combobox_label); |
| 232 layout->AddView(parent_combobox_); | 232 layout->AddView(parent_combobox_); |
| 233 layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing); | 233 layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing); |
| 234 | 234 |
| 235 layout->StartRow(0, 3); | 235 layout->StartRow(0, 3); |
| 236 layout->AddView(edit_button_); | 236 layout->AddView(edit_button_); |
| 237 layout->AddView(close_button_); | 237 layout->AddView(close_button_); |
| 238 | 238 |
| 239 AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)); | 239 AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, |
| 240 ui::EF_NONE, |
| 241 ui::ET_KEY_PRESSED)); |
| 240 } | 242 } |
| 241 | 243 |
| 242 BookmarkBubbleView::BookmarkBubbleView(views::View* anchor_view, | 244 BookmarkBubbleView::BookmarkBubbleView(views::View* anchor_view, |
| 243 Profile* profile, | 245 Profile* profile, |
| 244 const GURL& url, | 246 const GURL& url, |
| 245 bool newly_bookmarked) | 247 bool newly_bookmarked) |
| 246 : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT), | 248 : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT), |
| 247 profile_(profile), | 249 profile_(profile), |
| 248 url_(url), | 250 url_(url), |
| 249 newly_bookmarked_(newly_bookmarked), | 251 newly_bookmarked_(newly_bookmarked), |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 const BookmarkNode* new_parent = | 336 const BookmarkNode* new_parent = |
| 335 parent_model_.GetNodeAt(parent_combobox_->selected_index()); | 337 parent_model_.GetNodeAt(parent_combobox_->selected_index()); |
| 336 if (new_parent != node->parent()) { | 338 if (new_parent != node->parent()) { |
| 337 content::RecordAction( | 339 content::RecordAction( |
| 338 UserMetricsAction("BookmarkBubble_ChangeParent")); | 340 UserMetricsAction("BookmarkBubble_ChangeParent")); |
| 339 model->Move(node, new_parent, new_parent->child_count()); | 341 model->Move(node, new_parent, new_parent->child_count()); |
| 340 } | 342 } |
| 341 } | 343 } |
| 342 } | 344 } |
| 343 } | 345 } |
| OLD | NEW |