| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/base/resource/resource_bundle.h" | 5 #include "ui/base/resource/resource_bundle.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #else | 35 #else |
| 36 const int kSmallFontSizeDelta = -2; | 36 const int kSmallFontSizeDelta = -2; |
| 37 const int kMediumFontSizeDelta = 3; | 37 const int kMediumFontSizeDelta = 3; |
| 38 const int kLargeFontSizeDelta = 8; | 38 const int kLargeFontSizeDelta = 8; |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 } // namespace | 41 } // namespace |
| 42 | 42 |
| 43 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; | 43 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; |
| 44 | 44 |
| 45 /* static */ | 45 // static |
| 46 // TODO(glen): Finish moving these into theme provider (dialogs still | 46 // TODO(glen): Finish moving these into theme provider (dialogs still |
| 47 // depend on these colors). | 47 // depend on these colors). |
| 48 #if defined(USE_AURA) |
| 49 const SkColor ResourceBundle::frame_color = |
| 50 SkColorSetRGB(109, 109, 109); |
| 51 const SkColor ResourceBundle::frame_color_inactive = |
| 52 SkColorSetRGB(176, 176, 176); |
| 53 #else |
| 48 const SkColor ResourceBundle::frame_color = | 54 const SkColor ResourceBundle::frame_color = |
| 49 SkColorSetRGB(66, 116, 201); | 55 SkColorSetRGB(66, 116, 201); |
| 50 const SkColor ResourceBundle::frame_color_inactive = | 56 const SkColor ResourceBundle::frame_color_inactive = |
| 51 SkColorSetRGB(161, 182, 228); | 57 SkColorSetRGB(161, 182, 228); |
| 58 #endif |
| 52 const SkColor ResourceBundle::frame_color_app_panel = | 59 const SkColor ResourceBundle::frame_color_app_panel = |
| 53 SK_ColorWHITE; | 60 SK_ColorWHITE; |
| 54 const SkColor ResourceBundle::frame_color_app_panel_inactive = | 61 const SkColor ResourceBundle::frame_color_app_panel_inactive = |
| 55 SK_ColorWHITE; | 62 SK_ColorWHITE; |
| 56 const SkColor ResourceBundle::frame_color_incognito = | 63 const SkColor ResourceBundle::frame_color_incognito = |
| 57 SkColorSetRGB(83, 106, 139); | 64 SkColorSetRGB(83, 106, 139); |
| 58 const SkColor ResourceBundle::frame_color_incognito_inactive = | 65 const SkColor ResourceBundle::frame_color_incognito_inactive = |
| 59 SkColorSetRGB(126, 139, 156); | 66 SkColorSetRGB(126, 139, 156); |
| 60 const SkColor ResourceBundle::toolbar_color = | 67 const SkColor ResourceBundle::toolbar_color = |
| 61 SkColorSetRGB(210, 225, 246); | 68 SkColorSetRGB(210, 225, 246); |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 } | 422 } |
| 416 | 423 |
| 417 RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory( | 424 RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory( |
| 418 int resource_id) const { | 425 int resource_id) const { |
| 419 if (!data_pack_.get()) | 426 if (!data_pack_.get()) |
| 420 return NULL; | 427 return NULL; |
| 421 return data_pack_->GetStaticMemory(resource_id); | 428 return data_pack_->GetStaticMemory(resource_id); |
| 422 } | 429 } |
| 423 | 430 |
| 424 } // namespace ui | 431 } // namespace ui |
| OLD | NEW |