| 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 case COLOR_TOOLBAR_STROKE: | 346 case COLOR_TOOLBAR_STROKE: |
| 347 return otr ? kDefaultColorToolbarIncognitoStroke[mode] | 347 return otr ? kDefaultColorToolbarIncognitoStroke[mode] |
| 348 : kDefaultColorToolbarStroke[mode]; | 348 : kDefaultColorToolbarStroke[mode]; |
| 349 case COLOR_TOOLBAR_STROKE_INACTIVE: | 349 case COLOR_TOOLBAR_STROKE_INACTIVE: |
| 350 return kDefaultColorToolbarStrokeInactive; | 350 return kDefaultColorToolbarStrokeInactive; |
| 351 case COLOR_TOOLBAR_STROKE_THEME: | 351 case COLOR_TOOLBAR_STROKE_THEME: |
| 352 return kDefaultColorToolbarStrokeTheme; | 352 return kDefaultColorToolbarStrokeTheme; |
| 353 case COLOR_TOOLBAR_STROKE_THEME_INACTIVE: | 353 case COLOR_TOOLBAR_STROKE_THEME_INACTIVE: |
| 354 return kDefaultColorToolbarStrokeThemeInactive; | 354 return kDefaultColorToolbarStrokeThemeInactive; |
| 355 #endif | 355 #endif |
| 356 #if defined(OS_WIN) |
| 357 case COLOR_ACCENT_BORDER: |
| 358 NOTREACHED(); |
| 359 return gfx::kPlaceholderColor; |
| 360 #endif |
| 361 |
| 356 case COLOR_FRAME_INCOGNITO: | 362 case COLOR_FRAME_INCOGNITO: |
| 357 case COLOR_FRAME_INCOGNITO_INACTIVE: | 363 case COLOR_FRAME_INCOGNITO_INACTIVE: |
| 358 NOTREACHED() << "These values should be queried via their respective " | 364 NOTREACHED() << "These values should be queried via their respective " |
| 359 "non-incognito equivalents and an appropriate |otr| " | 365 "non-incognito equivalents and an appropriate |otr| " |
| 360 "value."; | 366 "value."; |
| 361 default: | |
| 362 return gfx::kPlaceholderColor; | 367 return gfx::kPlaceholderColor; |
| 363 } | 368 } |
| 369 |
| 370 return gfx::kPlaceholderColor; |
| 364 } | 371 } |
| OLD | NEW |