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

Side by Side Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 24544004: Remove the chrome namespace around ChromeContent[Renderer]Client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 1 month 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
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | no next file » | 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 "chrome_frame/test/net/fake_external_tab.h" 5 #include "chrome_frame/test/net/fake_external_tab.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <exdisp.h> 9 #include <exdisp.h>
10 #include <Winsock2.h> 10 #include <Winsock2.h>
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 } 134 }
135 135
136 class FakeContentBrowserClient : public chrome::ChromeContentBrowserClient { 136 class FakeContentBrowserClient : public chrome::ChromeContentBrowserClient {
137 public: 137 public:
138 virtual ~FakeContentBrowserClient() {} 138 virtual ~FakeContentBrowserClient() {}
139 139
140 virtual content::BrowserMainParts* CreateBrowserMainParts( 140 virtual content::BrowserMainParts* CreateBrowserMainParts(
141 const content::MainFunctionParams& parameters) OVERRIDE; 141 const content::MainFunctionParams& parameters) OVERRIDE;
142 }; 142 };
143 143
144 base::LazyInstance<chrome::ChromeContentClient> 144 base::LazyInstance<ChromeContentClient>
145 g_chrome_content_client = LAZY_INSTANCE_INITIALIZER; 145 g_chrome_content_client = LAZY_INSTANCE_INITIALIZER;
146 146
147 // Override the default ContentBrowserClient to let Chrome participate in 147 // Override the default ContentBrowserClient to let Chrome participate in
148 // content logic. Must be done before any tabs are created. 148 // content logic. Must be done before any tabs are created.
149 base::LazyInstance<FakeContentBrowserClient> 149 base::LazyInstance<FakeContentBrowserClient>
150 g_browser_client = LAZY_INSTANCE_INITIALIZER; 150 g_browser_client = LAZY_INSTANCE_INITIALIZER;
151 151
152 base::LazyInstance<chrome::ChromeContentRendererClient> 152 base::LazyInstance<ChromeContentRendererClient>
153 g_renderer_client = LAZY_INSTANCE_INITIALIZER; 153 g_renderer_client = LAZY_INSTANCE_INITIALIZER;
154 154
155 class FakeMainDelegate : public content::ContentMainDelegate { 155 class FakeMainDelegate : public content::ContentMainDelegate {
156 public: 156 public:
157 virtual ~FakeMainDelegate() {} 157 virtual ~FakeMainDelegate() {}
158 158
159 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE { 159 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE {
160 logging_win::InstallTestLogCollector( 160 logging_win::InstallTestLogCollector(
161 testing::UnitTest::GetInstance()); 161 testing::UnitTest::GetInstance());
162 162
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 content::InitializeSandboxInfo(&sandbox_info); 1003 content::InitializeSandboxInfo(&sandbox_info);
1004 FakeMainDelegate delegate; 1004 FakeMainDelegate delegate;
1005 content::ContentMain( 1005 content::ContentMain(
1006 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), 1006 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
1007 &sandbox_info, 1007 &sandbox_info,
1008 &delegate); 1008 &delegate);
1009 1009
1010 // Note: In debug builds, we ExitProcess during PostDestroyThreads. 1010 // Note: In debug builds, we ExitProcess during PostDestroyThreads.
1011 return g_test_suite->test_result(); 1011 return g_test_suite->test_result();
1012 } 1012 }
OLDNEW
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698