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

Side by Side Diff: chrome/browser/extensions/extension_web_ui.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 (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/extensions/extension_web_ui.h" 5 #include "chrome/browser/extensions/extension_web_ui.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/prefs/scoped_user_pref_update.h"
15 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
16 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
17 #include "base/thread_task_runner_handle.h" 15 #include "base/thread_task_runner_handle.h"
18 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manage r_private_api.h" 16 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manage r_private_api.h"
19 #include "chrome/browser/extensions/extension_tab_util.h" 17 #include "chrome/browser/extensions/extension_tab_util.h"
20 #include "chrome/browser/extensions/extension_util.h" 18 #include "chrome/browser/extensions/extension_util.h"
21 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
23 #include "chrome/common/extensions/extension_constants.h" 21 #include "chrome/common/extensions/extension_constants.h"
24 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
25 #include "components/favicon/core/favicon_service.h" 23 #include "components/favicon/core/favicon_service.h"
26 #include "components/favicon_base/favicon_util.h" 24 #include "components/favicon_base/favicon_util.h"
27 #include "components/pref_registry/pref_registry_syncable.h" 25 #include "components/pref_registry/pref_registry_syncable.h"
26 #include "components/prefs/pref_service.h"
27 #include "components/prefs/scoped_user_pref_update.h"
28 #include "content/public/browser/navigation_controller.h" 28 #include "content/public/browser/navigation_controller.h"
29 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
30 #include "content/public/browser/web_ui.h" 30 #include "content/public/browser/web_ui.h"
31 #include "content/public/common/bindings_policy.h" 31 #include "content/public/common/bindings_policy.h"
32 #include "extensions/browser/extension_registry.h" 32 #include "extensions/browser/extension_registry.h"
33 #include "extensions/browser/image_loader.h" 33 #include "extensions/browser/image_loader.h"
34 #include "extensions/common/extension.h" 34 #include "extensions/common/extension.h"
35 #include "extensions/common/extension_icon_set.h" 35 #include "extensions/common/extension_icon_set.h"
36 #include "extensions/common/extension_resource.h" 36 #include "extensions/common/extension_resource.h"
37 #include "extensions/common/manifest_handlers/icons_handler.h" 37 #include "extensions/common/manifest_handlers/icons_handler.h"
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 extensions::ImageLoader::ImageRepresentation::ALWAYS_RESIZE, 556 extensions::ImageLoader::ImageRepresentation::ALWAYS_RESIZE,
557 gfx::Size(pixel_size, pixel_size), 557 gfx::Size(pixel_size, pixel_size),
558 resource_scale_factor)); 558 resource_scale_factor));
559 } 559 }
560 560
561 // LoadImagesAsync actually can run callback synchronously. We want to force 561 // LoadImagesAsync actually can run callback synchronously. We want to force
562 // async. 562 // async.
563 extensions::ImageLoader::Get(profile)->LoadImagesAsync( 563 extensions::ImageLoader::Get(profile)->LoadImagesAsync(
564 extension, info_list, base::Bind(&RunFaviconCallbackAsync, callback)); 564 extension, info_list, base::Bind(&RunFaviconCallbackAsync, callback));
565 } 565 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_ui_util.cc ('k') | chrome/browser/extensions/external_provider_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698