chrome/browser/chromeos/app_mode/kiosk_app_data.cc - Issue 334053003: Moves extension_icon_image and image_loader to extensions/browser

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_app_data.cc

Issue 334053003: Moves extension_icon_image and image_loader to extensions/browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: include fail Created 6 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/background/background_contents_service.cc ('k') | chrome/browser/extensions/api/execute_code_function.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/chromeos/app_mode/kiosk_app_data.h"	5 #include "chrome/browser/chromeos/app_mode/kiosk_app_data.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

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

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

11 #include "base/json/json_writer.h"	11 #include "base/json/json_writer.h"

12 #include "base/memory/ref_counted_memory.h"	12 #include "base/memory/ref_counted_memory.h"

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

14 #include "base/prefs/scoped_user_pref_update.h"	14 #include "base/prefs/scoped_user_pref_update.h"

15 #include "base/threading/sequenced_worker_pool.h"	15 #include "base/threading/sequenced_worker_pool.h"

16 #include "base/values.h"	16 #include "base/values.h"

17 #include "chrome/browser/browser_process.h"	17 #include "chrome/browser/browser_process.h"

18 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h"	18 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h"

19 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"	19 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"

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

21 #include "chrome/browser/extensions/extension_util.h"	21 #include "chrome/browser/extensions/extension_util.h"

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

23 #include "chrome/browser/extensions/webstore_data_fetcher.h"	22 #include "chrome/browser/extensions/webstore_data_fetcher.h"

24 #include "chrome/browser/extensions/webstore_install_helper.h"	23 #include "chrome/browser/extensions/webstore_install_helper.h"

25 #include "chrome/browser/image_decoder.h"	24 #include "chrome/browser/image_decoder.h"

26 #include "chrome/browser/profiles/profile.h"	25 #include "chrome/browser/profiles/profile.h"

27 #include "chrome/common/extensions/extension_constants.h"	26 #include "chrome/common/extensions/extension_constants.h"

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

29 #include "extensions/browser/extension_system.h"	28 #include "extensions/browser/extension_system.h"

	29 #include "extensions/browser/image_loader.h"

30 #include "extensions/common/constants.h"	30 #include "extensions/common/constants.h"

31 #include "extensions/common/manifest.h"	31 #include "extensions/common/manifest.h"

32 #include "extensions/common/manifest_constants.h"	32 #include "extensions/common/manifest_constants.h"

33 #include "extensions/common/manifest_handlers/icons_handler.h"	33 #include "extensions/common/manifest_handlers/icons_handler.h"

34 #include "ui/gfx/codec/png_codec.h"	34 #include "ui/gfx/codec/png_codec.h"

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

36	36

37 using content::BrowserThread;	37 using content::BrowserThread;

38	38

39 namespace chromeos {	39 namespace chromeos {

(...skipping 455 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
495 if (!response->GetString(key, value)) {	495 if (!response->GetString(key, value)) {

496 LOG(ERROR) << "Webstore response error (" << key	496 LOG(ERROR) << "Webstore response error (" << key

497 << "): " << ValueToString(response);	497 << "): " << ValueToString(response);

498 OnWebstoreResponseParseFailure(kInvalidWebstoreResponseError);	498 OnWebstoreResponseParseFailure(kInvalidWebstoreResponseError);

499 return false;	499 return false;

500 }	500 }

501 return true;	501 return true;

502 }	502 }

503	503

504 } // namespace chromeos	504 } // namespace chromeos

OLD	NEW