chrome/browser/ui/web_applications/web_app_ui.cc - Issue 15239002: Move Extension and PermissionsData to extensions/common.

Side by Side Diff: chrome/browser/ui/web_applications/web_app_ui.cc

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month 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/script_bubble_view.cc ('k') | chrome/browser/ui/webui/app_list/start_page_handler.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 "chrome/browser/ui/web_applications/web_app_ui.h"	5 #include "chrome/browser/ui/web_applications/web_app_ui.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

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

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

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

12 #include "base/strings/string16.h"	12 #include "base/strings/string16.h"

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

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

15 #include "chrome/browser/extensions/image_loader.h"	15 #include "chrome/browser/extensions/image_loader.h"

16 #include "chrome/browser/extensions/tab_helper.h"	16 #include "chrome/browser/extensions/tab_helper.h"

17 #include "chrome/browser/favicon/favicon_tab_helper.h"	17 #include "chrome/browser/favicon/favicon_tab_helper.h"

18 #include "chrome/browser/history/select_favicon_frames.h"	18 #include "chrome/browser/history/select_favicon_frames.h"

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

20 #include "chrome/browser/web_applications/web_app.h"	20 #include "chrome/browser/web_applications/web_app.h"

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

22 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"	21 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

23 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"	22 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"

24 #include "chrome/common/pref_names.h"	23 #include "chrome/common/pref_names.h"

25 #include "content/public/browser/browser_thread.h"	24 #include "content/public/browser/browser_thread.h"

26 #include "content/public/browser/notification_details.h"	25 #include "content/public/browser/notification_details.h"

27 #include "content/public/browser/notification_registrar.h"	26 #include "content/public/browser/notification_registrar.h"

28 #include "content/public/browser/notification_source.h"	27 #include "content/public/browser/notification_source.h"

29 #include "content/public/browser/web_contents.h"	28 #include "content/public/browser/web_contents.h"

	29 #include "extensions/common/extension.h"

30 #include "grit/theme_resources.h"	30 #include "grit/theme_resources.h"

31 #include "skia/ext/image_operations.h"	31 #include "skia/ext/image_operations.h"

32 #include "third_party/skia/include/core/SkBitmap.h"	32 #include "third_party/skia/include/core/SkBitmap.h"

33 #include "ui/base/resource/resource_bundle.h"	33 #include "ui/base/resource/resource_bundle.h"

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

35 #include "ui/gfx/image/image_family.h"	35 #include "ui/gfx/image/image_family.h"

36 #include "ui/gfx/image/image_skia.h"	36 #include "ui/gfx/image/image_skia.h"

37 #include "url/gurl.h"	37 #include "url/gurl.h"

38	38

39 #if defined(OS_POSIX) && !defined(OS_MACOSX)	39 #if defined(OS_POSIX) && !defined(OS_MACOSX)

(...skipping 448 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
488 }	488 }

489	489

490 // \|info_list\| may still be empty at this point, in which case LoadImage	490 // \|info_list\| may still be empty at this point, in which case LoadImage

491 // will call the OnImageLoaded callback with an empty image and exit	491 // will call the OnImageLoaded callback with an empty image and exit

492 // immediately.	492 // immediately.

493 extensions::ImageLoader::Get(profile)->LoadImagesAsync(&extension, info_list,	493 extensions::ImageLoader::Get(profile)->LoadImagesAsync(&extension, info_list,

494 base::Bind(&OnImageLoaded, shortcut_info, callback));	494 base::Bind(&OnImageLoaded, shortcut_info, callback));

495 }	495 }

496	496

497 } // namespace web_app	497 } // namespace web_app

OLD	NEW