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

Side by Side Diff: chrome/browser/extensions/bookmark_app_helper.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "base/command_line.h" 69 #include "base/command_line.h"
70 #include "chrome/browser/web_applications/web_app_mac.h" 70 #include "chrome/browser/web_applications/web_app_mac.h"
71 #include "chrome/common/chrome_switches.h" 71 #include "chrome/common/chrome_switches.h"
72 #endif 72 #endif
73 73
74 #if defined(OS_WIN) 74 #if defined(OS_WIN)
75 #include "base/win/shortcut.h" 75 #include "base/win/shortcut.h"
76 #endif // defined(OS_WIN) 76 #endif // defined(OS_WIN)
77 77
78 #if defined(USE_ASH) 78 #if defined(USE_ASH)
79 #include "ash/common/shelf/shelf_delegate.h" // nogncheck 79 #include "ash/shelf/shelf_delegate.h" // nogncheck
80 #include "ash/common/wm_shell.h" // nogncheck 80 #include "ash/wm_shell.h" // nogncheck
81 #endif 81 #endif
82 82
83 namespace { 83 namespace {
84 84
85 using extensions::BookmarkAppHelper; 85 using extensions::BookmarkAppHelper;
86 86
87 // Overlays a shortcut icon over the bottom left corner of a given image. 87 // Overlays a shortcut icon over the bottom left corner of a given image.
88 class GeneratedIconImageSource : public gfx::CanvasImageSource { 88 class GeneratedIconImageSource : public gfx::CanvasImageSource {
89 public: 89 public:
90 explicit GeneratedIconImageSource(char letter, SkColor color, int output_size) 90 explicit GeneratedIconImageSource(char letter, SkColor color, int output_size)
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback)); 813 extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
814 } 814 }
815 815
816 bool IsValidBookmarkAppUrl(const GURL& url) { 816 bool IsValidBookmarkAppUrl(const GURL& url) {
817 URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes); 817 URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes);
818 origin_only_pattern.SetMatchAllURLs(true); 818 origin_only_pattern.SetMatchAllURLs(true);
819 return url.is_valid() && origin_only_pattern.MatchesURL(url); 819 return url.is_valid() && origin_only_pattern.MatchesURL(url);
820 } 820 }
821 821
822 } // namespace extensions 822 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698