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

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

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: _ Created 8 years, 9 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 #endif 106 #endif
107 107
108 #if defined(TOOLKIT_USES_GTK) 108 #if defined(TOOLKIT_USES_GTK)
109 #include "chrome/browser/ui/gtk/gtk_util.h" 109 #include "chrome/browser/ui/gtk/gtk_util.h"
110 #endif 110 #endif
111 111
112 #if defined(OS_CHROMEOS) 112 #if defined(OS_CHROMEOS)
113 #include "chrome/browser/chromeos/cros/cros_library.h" 113 #include "chrome/browser/chromeos/cros/cros_library.h"
114 #include "chrome/browser/chromeos/cros/network_library.h" 114 #include "chrome/browser/chromeos/cros/network_library.h"
115 #include "chrome/browser/chromeos/customization_document.h" 115 #include "chrome/browser/chromeos/customization_document.h"
116 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
117 #include "chrome/browser/chromeos/enterprise_extension_observer.h" 116 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
118 #include "chrome/browser/chromeos/gview_request_interceptor.h" 117 #include "chrome/browser/chromeos/gview_request_interceptor.h"
119 #include "chrome/browser/chromeos/network_message_observer.h" 118 #include "chrome/browser/chromeos/network_message_observer.h"
120 #include "chrome/browser/chromeos/power/low_battery_observer.h" 119 #include "chrome/browser/chromeos/power/low_battery_observer.h"
121 #include "chrome/browser/chromeos/sms_observer.h" 120 #include "chrome/browser/chromeos/sms_observer.h"
121 #include "chromeos/dbus/dbus_thread_manager.h"
122 #if defined(TOOLKIT_USES_GTK) 122 #if defined(TOOLKIT_USES_GTK)
123 #include "chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h" 123 #include "chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h"
124 #endif 124 #endif
125 #endif 125 #endif
126 126
127 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) 127 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
128 #include "ui/base/touch/touch_factory.h" 128 #include "ui/base/touch/touch_factory.h"
129 #endif 129 #endif
130 130
131 #if defined(OS_WIN) 131 #if defined(OS_WIN)
(...skipping 1759 matching lines...) Expand 10 before | Expand all | Expand 10 after
1891 1891
1892 Profile* profile = ProfileManager::GetLastUsedProfile(); 1892 Profile* profile = ProfileManager::GetLastUsedProfile();
1893 if (!profile) { 1893 if (!profile) {
1894 // We should only be able to get here if the profile already exists and 1894 // We should only be able to get here if the profile already exists and
1895 // has been created. 1895 // has been created.
1896 NOTREACHED(); 1896 NOTREACHED();
1897 return; 1897 return;
1898 } 1898 }
1899 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL); 1899 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
1900 } 1900 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698