chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc - Issue 10826219: launcher: Fix include paths and header guards.

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/ash/launcher/launcher_app_icon_loader.cc

Issue 10826219: launcher: Fix include paths and header guards. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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/ash/launcher/launcher_app_icon_loader.h"	5 #include "chrome/browser/ui/ash/launcher/launcher_app_icon_loader.h"

6	6

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

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

9 #include "chrome/browser/ui/tab_contents/tab_contents.h"	9 #include "chrome/browser/ui/tab_contents/tab_contents.h"

10 #include "chrome/common/extensions/extension.h"	10 #include "chrome/common/extensions/extension.h"

11	11

12 namespace {	12 namespace {

13	13

14 const extensions::Extension* GetExtensionByID(Profile* profile,	14 const extensions::Extension* GetExtensionByID(Profile* profile,

15 const std::string& id) {	15 const std::string& id) {

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61 if (i == map_.end())	61 if (i == map_.end())

62 return; // The tab has since been removed, do nothing.	62 return; // The tab has since been removed, do nothing.

63	63

64 std::string id = i->second;	64 std::string id = i->second;

65 map_.erase(i);	65 map_.erase(i);

66 if (image.IsEmpty())	66 if (image.IsEmpty())

67 host_->SetAppImage(id, extensions::Extension::GetDefaultIcon(true));	67 host_->SetAppImage(id, extensions::Extension::GetDefaultIcon(true));

68 else	68 else

69 host_->SetAppImage(id, *image.ToImageSkia());	69 host_->SetAppImage(id, *image.ToImageSkia());

70 }	70 }

OLD	NEW