chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

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/strings/utf_string_conversions.h"

10 #include "chrome/app/chrome_command_ids.h"	10 #include "chrome/app/chrome_command_ids.h"

11 #include "chrome/browser/bookmarks/bookmark_editor.h"	11 #include "chrome/browser/bookmarks/bookmark_editor.h"

12 #include "chrome/browser/bookmarks/bookmark_model.h"	12 #include "chrome/browser/bookmarks/bookmark_model.h"

13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

14 #include "chrome/browser/bookmarks/bookmark_utils.h"	14 #include "chrome/browser/bookmarks/bookmark_utils.h"

15 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_list.h"	17 #include "chrome/browser/ui/browser_list.h"

18 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view_observer.h"	18 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view_observer.h"

19 #include "content/public/browser/user_metrics.h"	19 #include "content/public/browser/user_metrics.h"

(...skipping 306 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
326 if (node) {	326 if (node) {

327 const string16 new_title = title_tf_->text();	327 const string16 new_title = title_tf_->text();

328 if (new_title != node->GetTitle()) {	328 if (new_title != node->GetTitle()) {

329 model->SetTitle(node, new_title);	329 model->SetTitle(node, new_title);

330 content::RecordAction(	330 content::RecordAction(

331 UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"));	331 UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"));

332 }	332 }

333 parent_model_.MaybeChangeParent(node, parent_combobox_->selected_index());	333 parent_model_.MaybeChangeParent(node, parent_combobox_->selected_index());

334 }	334 }

335 }	335 }

OLD	NEW