OLD | NEW |
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.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 196 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
197 #include "ui/base/win/shell.h" | 197 #include "ui/base/win/shell.h" |
198 #endif // OS_WIN | 198 #endif // OS_WIN |
199 | 199 |
200 #if defined(OS_MACOSX) | 200 #if defined(OS_MACOSX) |
201 #include "ui/base/cocoa/find_pasteboard.h" | 201 #include "ui/base/cocoa/find_pasteboard.h" |
202 #endif | 202 #endif |
203 | 203 |
204 #if defined(OS_CHROMEOS) | 204 #if defined(OS_CHROMEOS) |
205 #include "chrome/browser/chromeos/boot_times_loader.h" | 205 #include "chrome/browser/chromeos/boot_times_loader.h" |
206 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" | |
207 #include "chrome/browser/chromeos/dbus/power_manager_client.h" | |
208 #include "chrome/browser/chromeos/gdata/gdata_util.h" | 206 #include "chrome/browser/chromeos/gdata/gdata_util.h" |
209 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 207 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| 208 #include "chromeos/dbus/dbus_thread_manager.h" |
| 209 #include "chromeos/dbus/power_manager_client.h" |
210 #if defined(USE_AURA) | 210 #if defined(USE_AURA) |
211 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" | 211 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" |
212 #endif | 212 #endif |
213 #include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h" | 213 #include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h" |
214 #endif | 214 #endif |
215 | 215 |
216 #if defined(USE_ASH) | 216 #if defined(USE_ASH) |
217 #include "ash/ash_switches.h" | 217 #include "ash/ash_switches.h" |
218 #include "ash/shell.h" | 218 #include "ash/shell.h" |
219 #include "chrome/browser/ui/views/ash/panel_view_aura.h" | 219 #include "chrome/browser/ui/views/ash/panel_view_aura.h" |
(...skipping 5468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5688 ShowSingletonTabOverwritingNTP(params); | 5688 ShowSingletonTabOverwritingNTP(params); |
5689 } else { | 5689 } else { |
5690 LoginUIServiceFactory::GetForProfile( | 5690 LoginUIServiceFactory::GetForProfile( |
5691 profile()->GetOriginalProfile())->ShowLoginUI(false); | 5691 profile()->GetOriginalProfile())->ShowLoginUI(false); |
5692 } | 5692 } |
5693 } | 5693 } |
5694 | 5694 |
5695 void Browser::ToggleSpeechInput() { | 5695 void Browser::ToggleSpeechInput() { |
5696 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); | 5696 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); |
5697 } | 5697 } |
OLD | NEW |