← Back to branch summary

~zaspire/oxide/push-messaging

« back to all changes in this revision

Viewing changes to shared/browser/oxide_content_browser_client.cc

  • Committer: Chris Coulson
  • Date: 2015-06-12 01:05:21 UTC
  • Revision ID: chris.coulson@canonical.com-20150612010521-88ormpcpvswxaumk
Make ContentBrowserClient / ContentRendererClient memebers of ContentMainDelegate like ContentClient already is

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_content_browser_client.cc
63
63
 
64
64
namespace oxide {
65
65
 
66
 
ContentBrowserClient::ContentBrowserClient() {}
67
 
 
68
 
ContentBrowserClient::~ContentBrowserClient() {}
69
 
 
70
66
content::BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts(
71
67
    const content::MainFunctionParams& parameters) {
72
68
  return new BrowserMainParts();
282
278
#endif
283
279
}
284
280
 
285
 
void ContentBrowserClient::SetPlatformIntegration(
286
 
    BrowserPlatformIntegration* integration) {
287
 
  CHECK(integration && !platform_integration_);
288
 
  platform_integration_.reset(integration);
289
 
}
290
 
 
291
281
gpu::GpuControlList::OsType
292
282
ContentBrowserClient::GetOsTypeOverrideForGpuDataManager(
293
283
    std::string* os_version) {
305
295
  return platform_integration_->GetApplicationLocale();
306
296
}
307
297
 
 
298
ContentBrowserClient::ContentBrowserClient(
 
299
    BrowserPlatformIntegration* integration)
 
300
    : platform_integration_(integration) {}
 
301
 
 
302
ContentBrowserClient::~ContentBrowserClient() {}
 
303
 
308
304
} // namespace oxide