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

Side by Side Diff: content/shell/shell_main_delegate.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 | « chrome_frame/simple_resource_loader.cc ('k') | content/test/test_content_client.cc » ('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 "content/shell/shell_main_delegate.h" 5 #include "content/shell/shell_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #if defined(OS_ANDROID) 97 #if defined(OS_ANDROID)
98 bool got_path = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_dir); 98 bool got_path = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_dir);
99 DCHECK(got_path); 99 DCHECK(got_path);
100 pak_dir = pak_dir.Append(FILE_PATH_LITERAL("paks")); 100 pak_dir = pak_dir.Append(FILE_PATH_LITERAL("paks"));
101 #else 101 #else
102 PathService::Get(base::DIR_MODULE, &pak_dir); 102 PathService::Get(base::DIR_MODULE, &pak_dir);
103 #endif 103 #endif
104 104
105 pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")); 105 pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
106 #endif 106 #endif
107 ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file); 107 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
108 } 108 }
109 109
110 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { 110 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
111 browser_client_.reset(new content::ShellContentBrowserClient); 111 browser_client_.reset(new content::ShellContentBrowserClient);
112 return browser_client_.get(); 112 return browser_client_.get();
113 } 113 }
114 114
115 content::ContentRendererClient* 115 content::ContentRendererClient*
116 ShellMainDelegate::CreateContentRendererClient() { 116 ShellMainDelegate::CreateContentRendererClient() {
117 renderer_client_.reset(new content::ShellContentRendererClient); 117 renderer_client_.reset(new content::ShellContentRendererClient);
118 return renderer_client_.get(); 118 return renderer_client_.get();
119 } 119 }
OLDNEW
« no previous file with comments | « chrome_frame/simple_resource_loader.cc ('k') | content/test/test_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698