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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 const BookmarkNode* node = | 271 const BookmarkNode* node = |
272 bookmark_model->GetMostRecentlyAddedNodeForURL(url_); | 272 bookmark_model->GetMostRecentlyAddedNodeForURL(url_); |
273 if (node) | 273 if (node) |
274 return node->GetTitle(); | 274 return node->GetTitle(); |
275 else | 275 else |
276 NOTREACHED(); | 276 NOTREACHED(); |
277 return string16(); | 277 return string16(); |
278 } | 278 } |
279 | 279 |
280 void BookmarkBubbleView::ButtonPressed( | 280 void BookmarkBubbleView::ButtonPressed( |
281 views::Button* sender, const views::Event& event) { | 281 views::Button* sender, const ui::Event& event) { |
282 HandleButtonPressed(sender); | 282 HandleButtonPressed(sender); |
283 } | 283 } |
284 | 284 |
285 void BookmarkBubbleView::LinkClicked(views::Link* source, int event_flags) { | 285 void BookmarkBubbleView::LinkClicked(views::Link* source, int event_flags) { |
286 DCHECK(source == remove_link_); | 286 DCHECK(source == remove_link_); |
287 content::RecordAction(UserMetricsAction("BookmarkBubble_Unstar")); | 287 content::RecordAction(UserMetricsAction("BookmarkBubble_Unstar")); |
288 | 288 |
289 // Set this so we remove the bookmark after the window closes. | 289 // Set this so we remove the bookmark after the window closes. |
290 remove_bookmark_ = true; | 290 remove_bookmark_ = true; |
291 apply_edits_ = false; | 291 apply_edits_ = false; |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 const BookmarkNode* new_parent = | 343 const BookmarkNode* new_parent = |
344 parent_model_.GetNodeAt(parent_combobox_->selected_index()); | 344 parent_model_.GetNodeAt(parent_combobox_->selected_index()); |
345 if (new_parent != node->parent()) { | 345 if (new_parent != node->parent()) { |
346 content::RecordAction( | 346 content::RecordAction( |
347 UserMetricsAction("BookmarkBubble_ChangeParent")); | 347 UserMetricsAction("BookmarkBubble_ChangeParent")); |
348 model->Move(node, new_parent, new_parent->child_count()); | 348 model->Move(node, new_parent, new_parent->child_count()); |
349 } | 349 } |
350 } | 350 } |
351 } | 351 } |
352 } | 352 } |
OLD | NEW |