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

Side by Side Diff: chrome/browser/ui/browser_init.cc

Issue 8497007: Switch from MountLibrary to CrosDisksLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: NEW! Created 9 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
OLDNEW
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
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"
97 #include "chrome/browser/chromeos/cros/network_library.h" 96 #include "chrome/browser/chromeos/cros/network_library.h"
98 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 97 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
99 #include "chrome/browser/chromeos/customization_document.h" 98 #include "chrome/browser/chromeos/customization_document.h"
100 #include "chrome/browser/chromeos/enterprise_extension_observer.h" 99 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
101 #include "chrome/browser/chromeos/gview_request_interceptor.h" 100 #include "chrome/browser/chromeos/gview_request_interceptor.h"
102 #include "chrome/browser/chromeos/low_battery_observer.h" 101 #include "chrome/browser/chromeos/low_battery_observer.h"
103 #include "chrome/browser/chromeos/network_message_observer.h" 102 #include "chrome/browser/chromeos/network_message_observer.h"
104 #include "chrome/browser/chromeos/sms_observer.h" 103 #include "chrome/browser/chromeos/sms_observer.h"
105 #if defined(TOOLKIT_USES_GTK) 104 #if defined(TOOLKIT_USES_GTK)
106 #include "chrome/browser/chromeos/wm_message_listener.h" 105 #include "chrome/browser/chromeos/wm_message_listener.h"
(...skipping 1442 matching lines...) Expand 10 before | Expand all | Expand 10 after
1549 if (!automation->InitializeChannel(channel_id)) 1548 if (!automation->InitializeChannel(channel_id))
1550 return false; 1549 return false;
1551 automation->SetExpectedTabCount(expected_tabs); 1550 automation->SetExpectedTabCount(expected_tabs);
1552 1551
1553 AutomationProviderList* list = g_browser_process->GetAutomationProviderList(); 1552 AutomationProviderList* list = g_browser_process->GetAutomationProviderList();
1554 DCHECK(list); 1553 DCHECK(list);
1555 list->AddProvider(automation); 1554 list->AddProvider(automation);
1556 1555
1557 return true; 1556 return true;
1558 } 1557 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698