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

Side by Side Diff: content/shell/shell_content_browser_client.cc

Issue 10820007: Move all the layout tests that ran under browser_tests to run under content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 4 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 | Annotate | Revision Log
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_content_browser_client.h" 5 #include "content/shell/shell_content_browser_client.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 "content/public/browser/resource_dispatcher_host.h" 9 #include "content/public/browser/resource_dispatcher_host.h"
10 #include "content/shell/geolocation/shell_access_token_store.h" 10 #include "content/shell/geolocation/shell_access_token_store.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 } 81 }
82 mappings->push_back(std::pair<base::GlobalDescriptors::Key, int>( 82 mappings->push_back(std::pair<base::GlobalDescriptors::Key, int>(
83 kShellPakDescriptor, f)); 83 kShellPakDescriptor, f));
84 } 84 }
85 #endif 85 #endif
86 86
87 ShellBrowserContext* ShellContentBrowserClient::browser_context() { 87 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
88 return shell_browser_main_parts_->browser_context(); 88 return shell_browser_main_parts_->browser_context();
89 } 89 }
90 90
91 ShellBrowserContext*
92 ShellContentBrowserClient::off_the_record_browser_context() {
93 return shell_browser_main_parts_->off_the_record_browser_context();
94 }
95
91 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() { 96 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() {
92 return new ShellAccessTokenStore(browser_context()->GetRequestContext()); 97 return new ShellAccessTokenStore(browser_context()->GetRequestContext());
93 } 98 }
94 99
95 } // namespace content 100 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698