| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser/ui/browser_init.h" | 5 #include "chrome/browser/ui/browser_init.h" |
| 6 | 6 |
| 7 #include <algorithm> // For max(). | 7 #include <algorithm> // For max(). |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 // messages regardless of focus. | 425 // messages regardless of focus. |
| 426 chromeos::SystemKeyEventListener::instance(); | 426 chromeos::SystemKeyEventListener::instance(); |
| 427 | 427 |
| 428 // Create the WmOverviewController so it can register with the listener. | 428 // Create the WmOverviewController so it can register with the listener. |
| 429 chromeos::WmOverviewController::instance(); | 429 chromeos::WmOverviewController::instance(); |
| 430 | 430 |
| 431 // Install the GView request interceptor that will redirect requests | 431 // Install the GView request interceptor that will redirect requests |
| 432 // of compatible documents (PDF, etc) to the GView document viewer. | 432 // of compatible documents (PDF, etc) to the GView document viewer. |
| 433 const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); | 433 const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); |
| 434 if (parsed_command_line.HasSwitch(switches::kEnableGView)) { | 434 if (parsed_command_line.HasSwitch(switches::kEnableGView)) { |
| 435 chromeos::GViewRequestInterceptor::GetGViewRequestInterceptor(); | 435 chromeos::GViewRequestInterceptor::GetInstance(); |
| 436 } | 436 } |
| 437 if (process_startup) { | 437 if (process_startup) { |
| 438 // TODO(dhg): Try to make this just USBMountObserver::Get()->set_profile | 438 // TODO(dhg): Try to make this just USBMountObserver::Get()->set_profile |
| 439 // and have the constructor take care of everything else. | 439 // and have the constructor take care of everything else. |
| 440 chromeos::MountLibrary* lib = | 440 chromeos::MountLibrary* lib = |
| 441 chromeos::CrosLibrary::Get()->GetMountLibrary(); | 441 chromeos::CrosLibrary::Get()->GetMountLibrary(); |
| 442 chromeos::USBMountObserver* observe = chromeos::USBMountObserver::Get(); | 442 chromeos::USBMountObserver* observe = chromeos::USBMountObserver::Get(); |
| 443 lib->AddObserver(observe); | 443 lib->AddObserver(observe); |
| 444 observe->ScanForDevices(lib); | 444 observe->ScanForDevices(lib); |
| 445 // Connect the chromeos notifications | 445 // Connect the chromeos notifications |
| (...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1091 scoped_refptr<AutomationProviderClass> automation = | 1091 scoped_refptr<AutomationProviderClass> automation = |
| 1092 new AutomationProviderClass(profile); | 1092 new AutomationProviderClass(profile); |
| 1093 automation->ConnectToChannel(channel_id); | 1093 automation->ConnectToChannel(channel_id); |
| 1094 automation->SetExpectedTabCount(expected_tabs); | 1094 automation->SetExpectedTabCount(expected_tabs); |
| 1095 | 1095 |
| 1096 AutomationProviderList* list = | 1096 AutomationProviderList* list = |
| 1097 g_browser_process->InitAutomationProviderList(); | 1097 g_browser_process->InitAutomationProviderList(); |
| 1098 DCHECK(list); | 1098 DCHECK(list); |
| 1099 list->AddProvider(automation); | 1099 list->AddProvider(automation); |
| 1100 } | 1100 } |
| OLD | NEW |