| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/themes/theme_properties.h" | 5 #include "chrome/browser/themes/theme_properties.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/strings/string_split.h" | 10 #include "base/strings/string_split.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 IDR_HOME, | 193 IDR_HOME, |
| 194 IDR_HOME_H, | 194 IDR_HOME_H, |
| 195 IDR_HOME_P, | 195 IDR_HOME_P, |
| 196 IDR_RELOAD, | 196 IDR_RELOAD, |
| 197 IDR_RELOAD_H, | 197 IDR_RELOAD_H, |
| 198 IDR_RELOAD_P, | 198 IDR_RELOAD_P, |
| 199 IDR_STOP, | 199 IDR_STOP, |
| 200 IDR_STOP_D, | 200 IDR_STOP_D, |
| 201 IDR_STOP_H, | 201 IDR_STOP_H, |
| 202 IDR_STOP_P, | 202 IDR_STOP_P, |
| 203 #if defined(OS_MACOSX) | |
| 204 IDR_BROWSER_ACTIONS_OVERFLOW, | |
| 205 IDR_BROWSER_ACTIONS_OVERFLOW_H, | |
| 206 IDR_BROWSER_ACTIONS_OVERFLOW_P, | |
| 207 #endif | |
| 208 IDR_TOOLS, | 203 IDR_TOOLS, |
| 209 IDR_TOOLS_H, | 204 IDR_TOOLS_H, |
| 210 IDR_TOOLS_P, | 205 IDR_TOOLS_P, |
| 211 IDR_MENU_DROPARROW, | 206 IDR_MENU_DROPARROW, |
| 212 IDR_TOOLBAR_BEZEL_HOVER, | 207 IDR_TOOLBAR_BEZEL_HOVER, |
| 213 IDR_TOOLBAR_BEZEL_PRESSED, | 208 IDR_TOOLBAR_BEZEL_PRESSED, |
| 214 IDR_TOOLS_BAR, | 209 IDR_TOOLS_BAR, |
| 215 }; | 210 }; |
| 216 | 211 |
| 217 SkColor TintForUnderline(SkColor input) { | 212 SkColor TintForUnderline(SkColor input) { |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 #endif | 395 #endif |
| 401 case COLOR_FRAME_INCOGNITO: | 396 case COLOR_FRAME_INCOGNITO: |
| 402 case COLOR_FRAME_INCOGNITO_INACTIVE: | 397 case COLOR_FRAME_INCOGNITO_INACTIVE: |
| 403 NOTREACHED() << "These values should be queried via their respective " | 398 NOTREACHED() << "These values should be queried via their respective " |
| 404 "non-incognito equivalents and an appropriate |otr| " | 399 "non-incognito equivalents and an appropriate |otr| " |
| 405 "value."; | 400 "value."; |
| 406 default: | 401 default: |
| 407 return gfx::kPlaceholderColor; | 402 return gfx::kPlaceholderColor; |
| 408 } | 403 } |
| 409 } | 404 } |
| OLD | NEW |