chrome/browser/extensions/context_menu_matcher.cc - Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, 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/extensions/context_menu_matcher.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, 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/extensions/content_script_apitest.cc ('k') | chrome/browser/extensions/convert_user_script.cc » ('j') | no next file with comments »

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 "base/utf_string_conversions.h"	5 #include "base/strings/utf_string_conversions.h"

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

7 #include "chrome/browser/extensions/context_menu_matcher.h"	7 #include "chrome/browser/extensions/context_menu_matcher.h"

8 #include "chrome/browser/extensions/extension_service.h"	8 #include "chrome/browser/extensions/extension_service.h"

9 #include "chrome/browser/extensions/extension_system.h"	9 #include "chrome/browser/extensions/extension_system.h"

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

11 #include "content/public/common/context_menu_params.h"	11 #include "content/public/common/context_menu_params.h"

12 #include "ui/gfx/favicon_size.h"	12 #include "ui/gfx/favicon_size.h"

13 #include "ui/gfx/image/image.h"	13 #include "ui/gfx/image/image.h"

14	14

15 namespace extensions {	15 namespace extensions {

(...skipping 208 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
224 DCHECK_GE(index, 0);	224 DCHECK_GE(index, 0);

225	225

226 const SkBitmap& icon = menu_manager->GetIconForExtension(extension_id);	226 const SkBitmap& icon = menu_manager->GetIconForExtension(extension_id);

227 DCHECK(icon.width() == gfx::kFaviconSize);	227 DCHECK(icon.width() == gfx::kFaviconSize);

228 DCHECK(icon.height() == gfx::kFaviconSize);	228 DCHECK(icon.height() == gfx::kFaviconSize);

229	229

230 menu_model_->SetIcon(index, gfx::Image::CreateFrom1xBitmap(icon));	230 menu_model_->SetIcon(index, gfx::Image::CreateFrom1xBitmap(icon));

231 }	231 }

232	232

233 } // namespace extensions	233 } // namespace extensions

OLD	NEW