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/bookmark_app_helper.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 <cctype> 7 #include <cctype>
8 8
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" 11 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
12 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h" 12 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h"
13 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/extensions/crx_installer.h" 14 #include "chrome/browser/extensions/crx_installer.h"
15 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
16 #include "chrome/browser/extensions/favicon_downloader.h" 16 #include "chrome/browser/extensions/favicon_downloader.h"
17 #include "chrome/browser/extensions/launch_util.h" 17 #include "chrome/browser/extensions/launch_util.h"
18 #include "chrome/browser/extensions/tab_helper.h" 18 #include "chrome/browser/extensions/tab_helper.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/ui/app_list/app_list_service.h" 20 #include "chrome/browser/ui/app_list/app_list_service.h"
21 #include "chrome/browser/ui/app_list/app_list_util.h" 21 #include "chrome/browser/ui/app_list/app_list_util.h"
22 #include "chrome/browser/ui/browser_finder.h" 22 #include "chrome/browser/ui/browser_finder.h"
23 #include "chrome/browser/ui/browser_window.h" 23 #include "chrome/browser/ui/browser_window.h"
24 #include "chrome/browser/ui/host_desktop.h"
25 #include "chrome/browser/web_applications/web_app.h" 24 #include "chrome/browser/web_applications/web_app.h"
26 #include "chrome/common/extensions/extension_constants.h" 25 #include "chrome/common/extensions/extension_constants.h"
27 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 26 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
28 #include "chrome/common/url_constants.h" 27 #include "chrome/common/url_constants.h"
29 #include "content/public/browser/navigation_controller.h" 28 #include "content/public/browser/navigation_controller.h"
30 #include "content/public/browser/notification_service.h" 29 #include "content/public/browser/notification_service.h"
31 #include "content/public/browser/notification_source.h" 30 #include "content/public/browser/notification_source.h"
32 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
33 #include "extensions/browser/extension_registry.h" 32 #include "extensions/browser/extension_registry.h"
34 #include "extensions/browser/extension_system.h" 33 #include "extensions/browser/extension_system.h"
(...skipping 11 matching lines...) Expand all
46 #include "skia/ext/image_operations.h" 45 #include "skia/ext/image_operations.h"
47 #include "skia/ext/platform_canvas.h" 46 #include "skia/ext/platform_canvas.h"
48 #include "third_party/skia/include/core/SkBitmap.h" 47 #include "third_party/skia/include/core/SkBitmap.h"
49 #include "ui/base/l10n/l10n_util.h" 48 #include "ui/base/l10n/l10n_util.h"
50 #include "ui/gfx/canvas.h" 49 #include "ui/gfx/canvas.h"
51 #include "ui/gfx/color_analysis.h" 50 #include "ui/gfx/color_analysis.h"
52 #include "ui/gfx/color_utils.h" 51 #include "ui/gfx/color_utils.h"
53 #include "ui/gfx/font.h" 52 #include "ui/gfx/font.h"
54 #include "ui/gfx/font_list.h" 53 #include "ui/gfx/font_list.h"
55 #include "ui/gfx/geometry/rect.h" 54 #include "ui/gfx/geometry/rect.h"
55 #include "ui/gfx/host_desktop_type.h"
56 #include "ui/gfx/image/canvas_image_source.h" 56 #include "ui/gfx/image/canvas_image_source.h"
57 #include "ui/gfx/image/image.h" 57 #include "ui/gfx/image/image.h"
58 #include "ui/gfx/image/image_family.h" 58 #include "ui/gfx/image/image_family.h"
59 59
60 #if defined(OS_MACOSX) 60 #if defined(OS_MACOSX)
61 #include "base/command_line.h" 61 #include "base/command_line.h"
62 #include "chrome/browser/web_applications/web_app_mac.h" 62 #include "chrome/browser/web_applications/web_app_mac.h"
63 #include "chrome/common/chrome_switches.h" 63 #include "chrome/common/chrome_switches.h"
64 #endif 64 #endif
65 65
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback)); 790 extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
791 } 791 }
792 792
793 bool IsValidBookmarkAppUrl(const GURL& url) { 793 bool IsValidBookmarkAppUrl(const GURL& url) {
794 URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes); 794 URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes);
795 origin_only_pattern.SetMatchAllURLs(true); 795 origin_only_pattern.SetMatchAllURLs(true);
796 return url.is_valid() && origin_only_pattern.MatchesURL(url); 796 return url.is_valid() && origin_only_pattern.MatchesURL(url);
797 } 797 }
798 798
799 } // namespace extensions 799 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/app_process_apitest.cc ('k') | chrome/browser/extensions/bundle_installer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698