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

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

Issue 9668039: Move active_downloads_ui.* to chrome/browser/ui/webui/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again 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 | Annotate | Revision Log
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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 #include "ui/base/cocoa/find_pasteboard.h" 200 #include "ui/base/cocoa/find_pasteboard.h"
201 #endif 201 #endif
202 202
203 #if defined(OS_CHROMEOS) 203 #if defined(OS_CHROMEOS)
204 #include "chrome/browser/chromeos/boot_times_loader.h" 204 #include "chrome/browser/chromeos/boot_times_loader.h"
205 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 205 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
206 #include "chrome/browser/chromeos/dbus/power_manager_client.h" 206 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
207 #if defined(USE_AURA) 207 #if defined(USE_AURA)
208 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" 208 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
209 #endif 209 #endif
210 #include "chrome/browser/ui/webui/active_downloads_ui.h" 210 #include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h"
211 #endif 211 #endif
212 212
213 #if defined(USE_AURA) 213 #if defined(USE_AURA)
214 #include "ash/ash_switches.h" 214 #include "ash/ash_switches.h"
215 #include "ash/shell.h" 215 #include "ash/shell.h"
216 #include "chrome/browser/ui/views/ash/panel_view_aura.h" 216 #include "chrome/browser/ui/views/ash/panel_view_aura.h"
217 #endif 217 #endif
218 218
219 #if !defined(OS_CHROMEOS) || defined(USE_AURA) 219 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
220 #include "chrome/browser/download/download_shelf.h" 220 #include "chrome/browser/download/download_shelf.h"
(...skipping 5399 matching lines...) Expand 10 before | Expand all | Expand 10 after
5620 } else { 5620 } else {
5621 LoginUIServiceFactory::GetForProfile( 5621 LoginUIServiceFactory::GetForProfile(
5622 profile()->GetOriginalProfile())->ShowLoginUI(); 5622 profile()->GetOriginalProfile())->ShowLoginUI();
5623 } 5623 }
5624 #endif 5624 #endif
5625 } 5625 }
5626 5626
5627 void Browser::ToggleSpeechInput() { 5627 void Browser::ToggleSpeechInput() {
5628 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); 5628 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
5629 } 5629 }
OLDNEW
« no previous file with comments | « chrome/browser/download/save_page_browsertest.cc ('k') | chrome/browser/ui/browser_close_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698