Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(807)

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
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/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ref_counted_memory.h" 13 #include "base/memory/ref_counted_memory.h"
14 #include "base/prefs/pref_service.h"
15 #include "base/prefs/scoped_user_pref_update.h"
16 #include "base/threading/sequenced_worker_pool.h" 14 #include "base/threading/sequenced_worker_pool.h"
17 #include "base/values.h" 15 #include "base/values.h"
18 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h" 17 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h"
20 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 18 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
21 #include "chrome/browser/extensions/extension_service.h" 19 #include "chrome/browser/extensions/extension_service.h"
22 #include "chrome/browser/extensions/extension_util.h" 20 #include "chrome/browser/extensions/extension_util.h"
23 #include "chrome/browser/extensions/webstore_data_fetcher.h" 21 #include "chrome/browser/extensions/webstore_data_fetcher.h"
24 #include "chrome/browser/extensions/webstore_install_helper.h" 22 #include "chrome/browser/extensions/webstore_install_helper.h"
25 #include "chrome/browser/image_decoder.h" 23 #include "chrome/browser/image_decoder.h"
26 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
25 #include "components/prefs/pref_service.h"
26 #include "components/prefs/scoped_user_pref_update.h"
27 #include "content/public/browser/browser_thread.h" 27 #include "content/public/browser/browser_thread.h"
28 #include "extensions/browser/extension_system.h" 28 #include "extensions/browser/extension_system.h"
29 #include "extensions/browser/image_loader.h" 29 #include "extensions/browser/image_loader.h"
30 #include "extensions/browser/sandboxed_unpacker.h" 30 #include "extensions/browser/sandboxed_unpacker.h"
31 #include "extensions/common/constants.h" 31 #include "extensions/common/constants.h"
32 #include "extensions/common/extension_urls.h" 32 #include "extensions/common/extension_urls.h"
33 #include "extensions/common/manifest.h" 33 #include "extensions/common/manifest.h"
34 #include "extensions/common/manifest_constants.h" 34 #include "extensions/common/manifest_constants.h"
35 #include "extensions/common/manifest_handlers/icons_handler.h" 35 #include "extensions/common/manifest_handlers/icons_handler.h"
36 #include "ui/gfx/codec/png_codec.h" 36 #include "ui/gfx/codec/png_codec.h"
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 654
655 SkBitmap icon = crx_loader->icon(); 655 SkBitmap icon = crx_loader->icon();
656 if (icon.empty()) 656 if (icon.empty())
657 icon = *extensions::util::GetDefaultAppIcon().bitmap(); 657 icon = *extensions::util::GetDefaultAppIcon().bitmap();
658 SetCache(crx_loader->name(), icon); 658 SetCache(crx_loader->name(), icon);
659 659
660 SetStatus(STATUS_LOADED); 660 SetStatus(STATUS_LOADED);
661 } 661 }
662 662
663 } // namespace chromeos 663 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/app_mode/app_session.cc ('k') | chrome/browser/chromeos/app_mode/kiosk_app_launch_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698