Chromium Code Reviews| Index: chrome/browser/profiles/profile_io_data.cc |
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
| index 7f138d084102e0f3fc02da9f3e5bb51ea43a3616..0281016ddfe5b49c96236437e2d44522737784e8 100644 |
| --- a/chrome/browser/profiles/profile_io_data.cc |
| +++ b/chrome/browser/profiles/profile_io_data.cc |
| @@ -468,13 +468,13 @@ void ProfileIOData::LazyInitialize() const { |
| profile_params_->file_system_context, |
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE))); |
| DCHECK(set_protocol); |
| -#if defined(OS_CHROMEOS) |
| +#if defined(OS_CHROMEOS) && !defined(GOOGLE_CHROME_BUILD) |
| // Install the GView request interceptor that will redirect requests |
| // of compatible documents (PDF, etc) to the GView document viewer. |
| const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); |
| if (parsed_command_line.HasSwitch(switches::kEnableGView)) |
| job_factory_->AddInterceptor(new chromeos::GViewRequestInterceptor); |
| -#endif // defined(OS_CHROMEOS) |
| +#endif // defined(OS_CHROMEOS) && !defiend(GOOGLE_CHROME_BUILD) |
|
DaveMoore
2011/10/28 18:47:09
Nit: spelling
|
| media_stream_manager_.reset(new media_stream::MediaStreamManager); |