| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_frame/policy_settings.h" | 5 #include "chrome_frame/policy_settings.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/registry.h" | 8 #include "base/registry.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 config_key.Close(); | 58 config_key.Close(); |
| 59 } | 59 } |
| 60 } | 60 } |
| 61 | 61 |
| 62 DCHECK(value == RENDERER_NOT_SPECIFIED || | 62 DCHECK(value == RENDERER_NOT_SPECIFIED || |
| 63 value == RENDER_IN_HOST || | 63 value == RENDER_IN_HOST || |
| 64 value == RENDER_IN_CHROME_FRAME) << | 64 value == RENDER_IN_CHROME_FRAME) << |
| 65 "invalid default renderer setting: " << value; | 65 "invalid default renderer setting: " << value; |
| 66 | 66 |
| 67 if (value != RENDER_IN_HOST && value != RENDER_IN_CHROME_FRAME) { | 67 if (value != RENDER_IN_HOST && value != RENDER_IN_CHROME_FRAME) { |
| 68 DLOG(INFO) << "default renderer not specified via policy"; | 68 DVLOG(1) << "default renderer not specified via policy"; |
| 69 } else { | 69 } else { |
| 70 default_renderer_ = static_cast<RendererForUrl>(value); | 70 default_renderer_ = static_cast<RendererForUrl>(value); |
| 71 const char* exclusion_list_name = (default_renderer_ == RENDER_IN_HOST) ? | 71 const char* exclusion_list_name = (default_renderer_ == RENDER_IN_HOST) ? |
| 72 policy::key::kRenderInChromeFrameList : | 72 policy::key::kRenderInChromeFrameList : |
| 73 policy::key::kRenderInHostList; | 73 policy::key::kRenderInHostList; |
| 74 | 74 |
| 75 EnumerateKeyValues(config_key.Handle(), | 75 EnumerateKeyValues(config_key.Handle(), |
| 76 ASCIIToWide(exclusion_list_name).c_str(), &renderer_exclusion_list_); | 76 ASCIIToWide(exclusion_list_name).c_str(), &renderer_exclusion_list_); |
| 77 | 77 |
| 78 DLOG(INFO) << "Default renderer as specified via policy: " << | 78 DVLOG(1) << "Default renderer as specified via policy: " |
| 79 default_renderer_ << " exclusion list size: " << | 79 << default_renderer_ |
| 80 renderer_exclusion_list_.size(); | 80 << " exclusion list size: " << renderer_exclusion_list_.size(); |
| 81 } | 81 } |
| 82 | 82 |
| 83 std::wstring sub_key(policy::kRegistrySubKey); | 83 std::wstring sub_key(policy::kRegistrySubKey); |
| 84 sub_key += L"\\"; | 84 sub_key += L"\\"; |
| 85 sub_key += ASCIIToWide(policy::key::kChromeFrameContentTypes); | 85 sub_key += ASCIIToWide(policy::key::kChromeFrameContentTypes); |
| 86 | 86 |
| 87 for (int i = 0; i < arraysize(root_key) && content_type_list_.size() == 0; | 87 for (int i = 0; i < arraysize(root_key) && content_type_list_.size() == 0; |
| 88 ++i) { | 88 ++i) { |
| 89 EnumerateKeyValues(root_key[i], sub_key.c_str(), &content_type_list_); | 89 EnumerateKeyValues(root_key[i], sub_key.c_str(), &content_type_list_); |
| 90 } | 90 } |
| 91 } | 91 } |
| 92 | 92 |
| OLD | NEW |