OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_syncable_service.h" | 5 #include "chrome/browser/themes/theme_syncable_service.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 } | 97 } |
98 | 98 |
99 virtual bool UsingNativeTheme() const OVERRIDE { | 99 virtual bool UsingNativeTheme() const OVERRIDE { |
100 return using_native_theme_; | 100 return using_native_theme_; |
101 } | 101 } |
102 | 102 |
103 virtual string GetThemeID() const OVERRIDE { | 103 virtual string GetThemeID() const OVERRIDE { |
104 if (theme_extension_) | 104 if (theme_extension_) |
105 return theme_extension_->id(); | 105 return theme_extension_->id(); |
106 else | 106 else |
107 return ""; | 107 return std::string(); |
108 } | 108 } |
109 | 109 |
110 const extensions::Extension* theme_extension() const { | 110 const extensions::Extension* theme_extension() const { |
111 return theme_extension_.get(); | 111 return theme_extension_.get(); |
112 } | 112 } |
113 | 113 |
114 bool is_dirty() const { | 114 bool is_dirty() const { |
115 return is_dirty_; | 115 return is_dirty_; |
116 } | 116 } |
117 | 117 |
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
595 | 595 |
596 TEST_F(PolicyInstalledThemeTest, InstallThemeByPolicy) { | 596 TEST_F(PolicyInstalledThemeTest, InstallThemeByPolicy) { |
597 // Set up theme service to use custom theme that was installed by policy. | 597 // Set up theme service to use custom theme that was installed by policy. |
598 fake_theme_service_->SetTheme(theme_extension_.get()); | 598 fake_theme_service_->SetTheme(theme_extension_.get()); |
599 | 599 |
600 syncer::SyncDataList data_list = | 600 syncer::SyncDataList data_list = |
601 theme_sync_service_->GetAllSyncData(syncer::THEMES); | 601 theme_sync_service_->GetAllSyncData(syncer::THEMES); |
602 | 602 |
603 ASSERT_EQ(0u, data_list.size()); | 603 ASSERT_EQ(0u, data_list.size()); |
604 } | 604 } |
OLD | NEW |