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

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: Rebase Created 8 years, 8 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
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_list.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 #endif 107 #endif
108 108
109 #if defined(TOOLKIT_GTK) 109 #if defined(TOOLKIT_GTK)
110 #include "chrome/browser/ui/gtk/gtk_util.h" 110 #include "chrome/browser/ui/gtk/gtk_util.h"
111 #endif 111 #endif
112 112
113 #if defined(OS_CHROMEOS) 113 #if defined(OS_CHROMEOS)
114 #include "chrome/browser/chromeos/cros/cros_library.h" 114 #include "chrome/browser/chromeos/cros/cros_library.h"
115 #include "chrome/browser/chromeos/cros/network_library.h" 115 #include "chrome/browser/chromeos/cros/network_library.h"
116 #include "chrome/browser/chromeos/customization_document.h" 116 #include "chrome/browser/chromeos/customization_document.h"
117 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
118 #include "chrome/browser/chromeos/enterprise_extension_observer.h" 117 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
119 #include "chrome/browser/chromeos/gview_request_interceptor.h" 118 #include "chrome/browser/chromeos/gview_request_interceptor.h"
120 #include "chrome/browser/chromeos/network_message_observer.h" 119 #include "chrome/browser/chromeos/network_message_observer.h"
121 #include "chrome/browser/chromeos/power/low_battery_observer.h" 120 #include "chrome/browser/chromeos/power/low_battery_observer.h"
122 #include "chrome/browser/chromeos/sms_observer.h" 121 #include "chrome/browser/chromeos/sms_observer.h"
122 #include "chromeos/dbus/dbus_thread_manager.h"
123 #endif 123 #endif
124 124
125 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) 125 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
126 #include "ui/base/touch/touch_factory.h" 126 #include "ui/base/touch/touch_factory.h"
127 #endif 127 #endif
128 128
129 #if defined(OS_WIN) 129 #if defined(OS_WIN)
130 #include "base/win/windows_version.h" 130 #include "base/win/windows_version.h"
131 #include "chrome/installer/util/auto_launch_util.h" 131 #include "chrome/installer/util/auto_launch_util.h"
132 #endif 132 #endif
(...skipping 1775 matching lines...) Expand 10 before | Expand all | Expand 10 after
1908 1908
1909 Profile* profile = ProfileManager::GetLastUsedProfile(); 1909 Profile* profile = ProfileManager::GetLastUsedProfile();
1910 if (!profile) { 1910 if (!profile) {
1911 // We should only be able to get here if the profile already exists and 1911 // We should only be able to get here if the profile already exists and
1912 // has been created. 1912 // has been created.
1913 NOTREACHED(); 1913 NOTREACHED();
1914 return; 1914 return;
1915 } 1915 }
1916 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL); 1916 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
1917 } 1917 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698