chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.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_menu_delegate.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

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc ('k') | chrome/browser/ui/views/browser_action_test_util_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_menu_delegate.h"	5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"

6	6

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

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

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

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

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

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

14 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"	14 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"

15 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"	15 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"

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

17 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"	17 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"

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

(...skipping 451 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
470 gfx::ImageSkia* folder_icon =	470 gfx::ImageSkia* folder_icon =

471 rb.GetImageSkiaNamed(IDR_BOOKMARK_BAR_FOLDER);	471 rb.GetImageSkiaNamed(IDR_BOOKMARK_BAR_FOLDER);

472 MenuItemView* submenu = menu->AppendSubMenuWithIcon(	472 MenuItemView* submenu = menu->AppendSubMenuWithIcon(

473 id, node->GetTitle(), *folder_icon);	473 id, node->GetTitle(), *folder_icon);

474 BuildMenu(node, 0, submenu, next_menu_id);	474 BuildMenu(node, 0, submenu, next_menu_id);

475 } else {	475 } else {

476 NOTREACHED();	476 NOTREACHED();

477 }	477 }

478 }	478 }

479 }	479 }

OLD	NEW