| OLD | NEW |
|---|
| 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/ui/views/theme_image_mapper.h" | 5 #include "chrome/browser/ui/views/theme_image_mapper.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" |
| 7 #include "grit/theme_resources.h" | 8 #include "grit/theme_resources.h" |
| 8 | 9 |
| 9 namespace chrome { | 10 namespace chrome { |
| 10 | 11 |
| 11 // On platforms where there is both Ash and a desktop browser, provide DESKTOP | 12 // On platforms where there is both Ash and a desktop browser, provide DESKTOP |
| 12 // resources for the latter. | 13 // resources for the latter. |
| 13 int MapThemeImage(HostDesktopType desktop_type, int resource) { | 14 int MapThemeImage(HostDesktopType desktop_type, int resource) { |
| 14 #if !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && !defined(OS_ANDROID) | 15 #if !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
| 15 if (desktop_type != HOST_DESKTOP_TYPE_NATIVE) | 16 if (desktop_type != HOST_DESKTOP_TYPE_NATIVE) |
| 16 return resource; | 17 return resource; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 36 return IDR_THEME_TOOLBAR_DESKTOP; | 37 return IDR_THEME_TOOLBAR_DESKTOP; |
| 37 default: | 38 default: |
| 38 break; | 39 break; |
| 39 } | 40 } |
| 40 #endif | 41 #endif |
| 41 | 42 |
| 42 return resource; | 43 return resource; |
| 43 } | 44 } |
| 44 | 45 |
| 45 } // namespace chrome | 46 } // namespace chrome |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1545153002:
Switch to standard integer types in chrome/browser/ui/views/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master