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

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

Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/views/ash/OWNERS » ('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.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 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/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/aura/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"
221 #endif 221 #endif
222 222
223 #if defined(FILE_MANAGER_EXTENSION) 223 #if defined(FILE_MANAGER_EXTENSION)
224 #include "chrome/browser/chromeos/extensions/file_manager_util.h" 224 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
225 #endif 225 #endif
226 226
(...skipping 5392 matching lines...) Expand 10 before | Expand all | Expand 10 after
5619 ShowSingletonTabOverwritingNTP(params); 5619 ShowSingletonTabOverwritingNTP(params);
5620 } else { 5620 } else {
5621 LoginUIServiceFactory::GetForProfile( 5621 LoginUIServiceFactory::GetForProfile(
5622 profile()->GetOriginalProfile())->ShowLoginUI(); 5622 profile()->GetOriginalProfile())->ShowLoginUI();
5623 } 5623 }
5624 } 5624 }
5625 5625
5626 void Browser::ToggleSpeechInput() { 5626 void Browser::ToggleSpeechInput() {
5627 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); 5627 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
5628 } 5628 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/views/ash/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698