| 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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 // should be removed once the cocoa port no longer uses them. | 188 // should be removed once the cocoa port no longer uses them. |
| 189 constexpr int kToolbarButtonIDs[] = { | 189 constexpr int kToolbarButtonIDs[] = { |
| 190 IDR_BACK, | 190 IDR_BACK, |
| 191 IDR_BACK_D, | 191 IDR_BACK_D, |
| 192 IDR_BACK_H, | 192 IDR_BACK_H, |
| 193 IDR_BACK_P, | 193 IDR_BACK_P, |
| 194 IDR_FORWARD, | 194 IDR_FORWARD, |
| 195 IDR_FORWARD_D, | 195 IDR_FORWARD_D, |
| 196 IDR_FORWARD_H, | 196 IDR_FORWARD_H, |
| 197 IDR_FORWARD_P, | 197 IDR_FORWARD_P, |
| 198 #if defined(OS_MACOSX) |
| 198 IDR_HOME, | 199 IDR_HOME, |
| 199 IDR_HOME_H, | 200 IDR_HOME_H, |
| 200 IDR_HOME_P, | 201 IDR_HOME_P, |
| 202 #endif |
| 201 IDR_RELOAD, | 203 IDR_RELOAD, |
| 202 IDR_RELOAD_H, | 204 IDR_RELOAD_H, |
| 203 IDR_RELOAD_P, | 205 IDR_RELOAD_P, |
| 204 IDR_STOP, | 206 IDR_STOP, |
| 205 IDR_STOP_D, | 207 IDR_STOP_D, |
| 206 IDR_STOP_H, | 208 IDR_STOP_H, |
| 207 IDR_STOP_P, | 209 IDR_STOP_P, |
| 208 IDR_TOOLS, | 210 IDR_TOOLS, |
| 209 IDR_TOOLS_H, | 211 IDR_TOOLS_H, |
| 210 IDR_TOOLS_P, | 212 IDR_TOOLS_P, |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 #endif | 405 #endif |
| 404 case COLOR_FRAME_INCOGNITO: | 406 case COLOR_FRAME_INCOGNITO: |
| 405 case COLOR_FRAME_INCOGNITO_INACTIVE: | 407 case COLOR_FRAME_INCOGNITO_INACTIVE: |
| 406 NOTREACHED() << "These values should be queried via their respective " | 408 NOTREACHED() << "These values should be queried via their respective " |
| 407 "non-incognito equivalents and an appropriate |otr| " | 409 "non-incognito equivalents and an appropriate |otr| " |
| 408 "value."; | 410 "value."; |
| 409 default: | 411 default: |
| 410 return gfx::kPlaceholderColor; | 412 return gfx::kPlaceholderColor; |
| 411 } | 413 } |
| 412 } | 414 } |
| OLD | NEW |