chrome/browser/ui/views/create_application_shortcut_view.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

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/create_application_shortcut_view.cc

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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/cookie_info_view.cc ('k') | chrome/browser/ui/views/database_info_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/views/create_application_shortcut_view.h"	5 #include "chrome/browser/ui/views/create_application_shortcut_view.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "app/resource_bundle.h"	8 #include "app/resource_bundle.h"

9 #include "base/callback.h"	9 #include "base/callback.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "base/win/windows_version.h"	11 #include "base/win/windows_version.h"

12 #include "chrome/browser/prefs/pref_service.h"	12 #include "chrome/browser/prefs/pref_service.h"

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

14 #include "chrome/browser/tab_contents/tab_contents.h"	14 #include "chrome/browser/tab_contents/tab_contents.h"

15 #include "chrome/browser/tab_contents/tab_contents_delegate.h"	15 #include "chrome/browser/tab_contents/tab_contents_delegate.h"

(...skipping 497 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
513 void CreateChromeApplicationShortcutView::OnImageLoaded(	513 void CreateChromeApplicationShortcutView::OnImageLoaded(

514 SkBitmap* image, ExtensionResource resource, int index) {	514 SkBitmap* image, ExtensionResource resource, int index) {

515 if (image->isNull()) {	515 if (image->isNull()) {

516 NOTREACHED() << "Corrupt image in profile?";	516 NOTREACHED() << "Corrupt image in profile?";

517 return;	517 return;

518 }	518 }

519 shortcut_info_.favicon = *image;	519 shortcut_info_.favicon = *image;

520 static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);	520 static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);

521 }	521 }

522	522

OLD	NEW