Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/environment.h" | 10 #include "base/environment.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 86 #include "base/mac/mac_util.h" | 86 #include "base/mac/mac_util.h" |
| 87 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" | 87 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" |
| 88 #endif | 88 #endif |
| 89 | 89 |
| 90 #if defined(TOOLKIT_USES_GTK) | 90 #if defined(TOOLKIT_USES_GTK) |
| 91 #include "chrome/browser/ui/gtk/gtk_util.h" | 91 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 92 #endif | 92 #endif |
| 93 | 93 |
| 94 #if defined(OS_CHROMEOS) | 94 #if defined(OS_CHROMEOS) |
| 95 #include "chrome/browser/chromeos/cros/cros_library.h" | 95 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 96 #include "chrome/browser/chromeos/cros/mount_library.h" | |
|
satorux1
2011/11/07 23:21:55
Nice. You might want to do this in a separate patc
hashimoto
2011/11/08 07:31:05
OK, I will do this later.
| |
| 97 #include "chrome/browser/chromeos/cros/network_library.h" | 96 #include "chrome/browser/chromeos/cros/network_library.h" |
| 98 #include "chrome/browser/chromeos/customization_document.h" | 97 #include "chrome/browser/chromeos/customization_document.h" |
| 99 #include "chrome/browser/chromeos/enterprise_extension_observer.h" | 98 #include "chrome/browser/chromeos/enterprise_extension_observer.h" |
| 100 #include "chrome/browser/chromeos/gview_request_interceptor.h" | 99 #include "chrome/browser/chromeos/gview_request_interceptor.h" |
| 101 #include "chrome/browser/chromeos/low_battery_observer.h" | 100 #include "chrome/browser/chromeos/low_battery_observer.h" |
| 102 #include "chrome/browser/chromeos/network_message_observer.h" | 101 #include "chrome/browser/chromeos/network_message_observer.h" |
| 103 #include "chrome/browser/chromeos/sms_observer.h" | 102 #include "chrome/browser/chromeos/sms_observer.h" |
| 104 #if defined(TOOLKIT_USES_GTK) | 103 #if defined(TOOLKIT_USES_GTK) |
| 105 #include "chrome/browser/chromeos/wm_message_listener.h" | 104 #include "chrome/browser/chromeos/wm_message_listener.h" |
| 106 #endif | 105 #endif |
| (...skipping 1441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1548 if (!automation->InitializeChannel(channel_id)) | 1547 if (!automation->InitializeChannel(channel_id)) |
| 1549 return false; | 1548 return false; |
| 1550 automation->SetExpectedTabCount(expected_tabs); | 1549 automation->SetExpectedTabCount(expected_tabs); |
| 1551 | 1550 |
| 1552 AutomationProviderList* list = g_browser_process->GetAutomationProviderList(); | 1551 AutomationProviderList* list = g_browser_process->GetAutomationProviderList(); |
| 1553 DCHECK(list); | 1552 DCHECK(list); |
| 1554 list->AddProvider(automation); | 1553 list->AddProvider(automation); |
| 1555 | 1554 |
| 1556 return true; | 1555 return true; |
| 1557 } | 1556 } |
| OLD | NEW |