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

Side by Side Diff: chrome/browser/ui/browser.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.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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 198 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
199 #include "ui/base/win/shell.h" 199 #include "ui/base/win/shell.h"
200 #endif // OS_WIN 200 #endif // OS_WIN
201 201
202 #if defined(OS_MACOSX) 202 #if defined(OS_MACOSX)
203 #include "ui/base/cocoa/find_pasteboard.h" 203 #include "ui/base/cocoa/find_pasteboard.h"
204 #endif 204 #endif
205 205
206 #if defined(OS_CHROMEOS) 206 #if defined(OS_CHROMEOS)
207 #include "chrome/browser/chromeos/boot_times_loader.h" 207 #include "chrome/browser/chromeos/boot_times_loader.h"
208 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
209 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
210 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 208 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
211 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" 209 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
212 #include "chrome/browser/ui/views/ash/window_positioner.h" 210 #include "chrome/browser/ui/views/ash/window_positioner.h"
211 #include "chromeos/dbus/dbus_thread_manager.h"
212 #include "chromeos/dbus/power_manager_client.h"
213 #if defined(USE_AURA) 213 #if defined(USE_AURA)
214 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" 214 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
215 #endif 215 #endif
216 #include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h" 216 #include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h"
217 #endif 217 #endif
218 218
219 #if defined(USE_ASH) 219 #if defined(USE_ASH)
220 #include "ash/ash_switches.h" 220 #include "ash/ash_switches.h"
221 #include "ash/shell.h" 221 #include "ash/shell.h"
222 #include "chrome/browser/ui/views/ash/panel_view_aura.h" 222 #include "chrome/browser/ui/views/ash/panel_view_aura.h"
(...skipping 5453 matching lines...) Expand 10 before | Expand all | Expand 10 after
5676 } else { 5676 } else {
5677 LoginUIServiceFactory::GetForProfile( 5677 LoginUIServiceFactory::GetForProfile(
5678 profile()->GetOriginalProfile())->ShowLoginUI(false); 5678 profile()->GetOriginalProfile())->ShowLoginUI(false);
5679 } 5679 }
5680 #endif 5680 #endif
5681 } 5681 }
5682 5682
5683 void Browser::ToggleSpeechInput() { 5683 void Browser::ToggleSpeechInput() {
5684 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); 5684 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
5685 } 5685 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698