Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Side by Side Diff: ui/aura/test/test_aura_initializer.cc

Issue 10686005: Add methods to add DataPack from open files (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/test/test_content_client.cc ('k') | ui/base/resource/data_pack.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ui/aura/test/test_aura_initializer.h" 5 #include "ui/aura/test/test_aura_initializer.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 10
11 namespace aura { 11 namespace aura {
12 namespace test { 12 namespace test {
13 13
14 TestAuraInitializer::TestAuraInitializer() { 14 TestAuraInitializer::TestAuraInitializer() {
15 #if defined(OS_LINUX) 15 #if defined(OS_LINUX)
16 FilePath pak_file; 16 FilePath pak_file;
17 PathService::Get(base::DIR_MODULE, &pak_file); 17 PathService::Get(base::DIR_MODULE, &pak_file);
18 pak_file = pak_file.Append(FILE_PATH_LITERAL( 18 pak_file = pak_file.Append(FILE_PATH_LITERAL(
19 "test_support_aura_resources.pak")); 19 "test_support_aura_resources.pak"));
20 ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file); 20 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
21 #endif 21 #endif
22 } 22 }
23 23
24 TestAuraInitializer::~TestAuraInitializer() { 24 TestAuraInitializer::~TestAuraInitializer() {
25 #if defined(OS_LINUX) 25 #if defined(OS_LINUX)
26 ui::ResourceBundle::CleanupSharedInstance(); 26 ui::ResourceBundle::CleanupSharedInstance();
27 #endif 27 #endif
28 } 28 }
29 29
30 } // namespace test 30 } // namespace test
31 } // namespace aura 31 } // namespace aura
OLDNEW
« no previous file with comments | « content/test/test_content_client.cc ('k') | ui/base/resource/data_pack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698