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

Side by Side Diff: chrome/browser/extensions/bookmark_app_helper.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/bookmark_app_helper.h" 5 #include "chrome/browser/extensions/bookmark_app_helper.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cctype> 9 #include <cctype>
10 #include <string> 10 #include <string>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
15 #include "build/build_config.h" 14 #include "build/build_config.h"
16 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" 15 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
17 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h" 16 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h"
18 #include "chrome/browser/chrome_notification_types.h" 17 #include "chrome/browser/chrome_notification_types.h"
19 #include "chrome/browser/extensions/crx_installer.h" 18 #include "chrome/browser/extensions/crx_installer.h"
20 #include "chrome/browser/extensions/extension_service.h" 19 #include "chrome/browser/extensions/extension_service.h"
21 #include "chrome/browser/extensions/favicon_downloader.h" 20 #include "chrome/browser/extensions/favicon_downloader.h"
22 #include "chrome/browser/extensions/launch_util.h" 21 #include "chrome/browser/extensions/launch_util.h"
23 #include "chrome/browser/extensions/tab_helper.h" 22 #include "chrome/browser/extensions/tab_helper.h"
24 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/ui/app_list/app_list_service.h" 24 #include "chrome/browser/ui/app_list/app_list_service.h"
26 #include "chrome/browser/ui/app_list/app_list_util.h" 25 #include "chrome/browser/ui/app_list/app_list_util.h"
27 #include "chrome/browser/ui/browser_finder.h" 26 #include "chrome/browser/ui/browser_finder.h"
28 #include "chrome/browser/ui/browser_window.h" 27 #include "chrome/browser/ui/browser_window.h"
29 #include "chrome/browser/ui/host_desktop.h" 28 #include "chrome/browser/ui/host_desktop.h"
30 #include "chrome/browser/web_applications/web_app.h" 29 #include "chrome/browser/web_applications/web_app.h"
31 #include "chrome/common/extensions/extension_constants.h" 30 #include "chrome/common/extensions/extension_constants.h"
32 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 31 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
33 #include "chrome/common/url_constants.h" 32 #include "chrome/common/url_constants.h"
33 #include "components/prefs/pref_service.h"
34 #include "content/public/browser/navigation_controller.h" 34 #include "content/public/browser/navigation_controller.h"
35 #include "content/public/browser/notification_service.h" 35 #include "content/public/browser/notification_service.h"
36 #include "content/public/browser/notification_source.h" 36 #include "content/public/browser/notification_source.h"
37 #include "content/public/browser/web_contents.h" 37 #include "content/public/browser/web_contents.h"
38 #include "extensions/browser/extension_registry.h" 38 #include "extensions/browser/extension_registry.h"
39 #include "extensions/browser/extension_system.h" 39 #include "extensions/browser/extension_system.h"
40 #include "extensions/browser/image_loader.h" 40 #include "extensions/browser/image_loader.h"
41 #include "extensions/browser/notification_types.h" 41 #include "extensions/browser/notification_types.h"
42 #include "extensions/browser/pref_names.h" 42 #include "extensions/browser/pref_names.h"
43 #include "extensions/common/constants.h" 43 #include "extensions/common/constants.h"
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback)); 797 extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
798 } 798 }
799 799
800 bool IsValidBookmarkAppUrl(const GURL& url) { 800 bool IsValidBookmarkAppUrl(const GURL& url) {
801 URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes); 801 URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes);
802 origin_only_pattern.SetMatchAllURLs(true); 802 origin_only_pattern.SetMatchAllURLs(true);
803 return url.is_valid() && origin_only_pattern.MatchesURL(url); 803 return url.is_valid() && origin_only_pattern.MatchesURL(url);
804 } 804 }
805 805
806 } // namespace extensions 806 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/blacklist.cc ('k') | chrome/browser/extensions/component_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698