| OLD | NEW |
| 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/ui/bookmarks/bookmark_utils.h" | 5 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 } | 88 } |
| 89 | 89 |
| 90 if (removed) | 90 if (removed) |
| 91 return BOOKMARK_SHORTCUT_DISPOSITION_REMOVED; | 91 return BOOKMARK_SHORTCUT_DISPOSITION_REMOVED; |
| 92 #endif | 92 #endif |
| 93 return BOOKMARK_SHORTCUT_DISPOSITION_UNCHANGED; | 93 return BOOKMARK_SHORTCUT_DISPOSITION_UNCHANGED; |
| 94 } | 94 } |
| 95 | 95 |
| 96 #if defined(TOOLKIT_VIEWS) | 96 #if defined(TOOLKIT_VIEWS) |
| 97 gfx::ImageSkia GetFolderIcon(gfx::VectorIconId id, SkColor text_color) { | 97 gfx::ImageSkia GetFolderIcon(gfx::VectorIconId id, SkColor text_color) { |
| 98 return gfx::CreateVectorIcon(id, 16, | 98 return gfx::CreateVectorIcon(id, |
| 99 color_utils::DeriveDefaultIconColor(text_color)); | 99 color_utils::DeriveDefaultIconColor(text_color)); |
| 100 } | 100 } |
| 101 #endif | 101 #endif |
| 102 | 102 |
| 103 } // namespace | 103 } // namespace |
| 104 | 104 |
| 105 GURL GetURLToBookmark(content::WebContents* web_contents) { | 105 GURL GetURLToBookmark(content::WebContents* web_contents) { |
| 106 DCHECK(web_contents); | 106 DCHECK(web_contents); |
| 107 return search::IsInstantNTP(web_contents) ? GURL(kChromeUINewTabURL) | 107 return search::IsInstantNTP(web_contents) ? GURL(kChromeUINewTabURL) |
| 108 : web_contents->GetURL(); | 108 : web_contents->GetURL(); |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 312 return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
| 313 IDR_BOOKMARK_BAR_FOLDER_MANAGED); | 313 IDR_BOOKMARK_BAR_FOLDER_MANAGED); |
| 314 } | 314 } |
| 315 #endif | 315 #endif |
| 316 | 316 |
| 317 return GetFolderIcon(gfx::VectorIconId::FOLDER_MANAGED, text_color); | 317 return GetFolderIcon(gfx::VectorIconId::FOLDER_MANAGED, text_color); |
| 318 } | 318 } |
| 319 #endif | 319 #endif |
| 320 | 320 |
| 321 } // namespace chrome | 321 } // namespace chrome |
| OLD | NEW |