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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.cc

Issue 10377114: Remove some more OS_CHROMEOS from browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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/views/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/launcher/launcher_types.h" 7 #include "ash/launcher/launcher_types.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/wm/partial_screenshot_view.h" 9 #include "ash/wm/partial_screenshot_view.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 18 matching lines...) Expand all
29 29
30 #if defined(OS_CHROMEOS) 30 #if defined(OS_CHROMEOS)
31 #include "base/chromeos/chromeos_version.h" 31 #include "base/chromeos/chromeos_version.h"
32 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 32 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
33 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" 33 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
34 #include "chrome/browser/chromeos/extensions/file_manager_util.h" 34 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
35 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 35 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
36 #include "chrome/browser/chromeos/login/webui_login_display_host.h" 36 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
37 #include "chrome/browser/chromeos/login/user_manager.h" 37 #include "chrome/browser/chromeos/login/user_manager.h"
38 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 38 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
39 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
39 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 40 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
40 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" 41 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
41 #include "chromeos/dbus/dbus_thread_manager.h" 42 #include "chromeos/dbus/dbus_thread_manager.h"
42 #include "chromeos/dbus/power_manager_client.h" 43 #include "chromeos/dbus/power_manager_client.h"
43 #endif 44 #endif
44 45
45 // static 46 // static
46 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; 47 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
47 48
48 ChromeShellDelegate::ChromeShellDelegate() 49 ChromeShellDelegate::ChromeShellDelegate()
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 content::OpenURLParams(GURL(chrome::kChromeUIMobileSetupURL), 185 content::OpenURLParams(GURL(chrome::kChromeUIMobileSetupURL),
185 content::Referrer(), 186 content::Referrer(),
186 NEW_FOREGROUND_TAB, 187 NEW_FOREGROUND_TAB,
187 content::PAGE_TRANSITION_LINK, 188 content::PAGE_TRANSITION_LINK,
188 false)); 189 false));
189 browser->window()->Activate(); 190 browser->window()->Activate();
190 } 191 }
191 #endif 192 #endif
192 } 193 }
193 194
195 void ChromeShellDelegate::ShowKeyboardOverlay(ui::AcceleratorTarget* target) {
196 #if defined(OS_CHROMEOS)
197 KeyboardOverlayDialogView::ShowDialog(target);
198 #endif
199 }
200
194 content::BrowserContext* ChromeShellDelegate::GetCurrentBrowserContext() { 201 content::BrowserContext* ChromeShellDelegate::GetCurrentBrowserContext() {
195 return ProfileManager::GetDefaultProfile(); 202 return ProfileManager::GetDefaultProfile();
196 } 203 }
197 204
198 void ChromeShellDelegate::ToggleSpokenFeedback() { 205 void ChromeShellDelegate::ToggleSpokenFeedback() {
199 #if defined(OS_CHROMEOS) 206 #if defined(OS_CHROMEOS)
200 content::WebUI* login_screen_web_ui = NULL; 207 content::WebUI* login_screen_web_ui = NULL;
201 chromeos::WebUILoginDisplayHost* host = 208 chromeos::WebUILoginDisplayHost* host =
202 static_cast<chromeos::WebUILoginDisplayHost*>( 209 static_cast<chromeos::WebUILoginDisplayHost*>(
203 chromeos::BaseLoginDisplayHost::default_host()); 210 chromeos::BaseLoginDisplayHost::default_host());
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 ash::Shell::GetInstance()->CreateLauncher(); 259 ash::Shell::GetInstance()->CreateLauncher();
253 break; 260 break;
254 default: 261 default:
255 NOTREACHED() << "Unexpected notification " << type; 262 NOTREACHED() << "Unexpected notification " << type;
256 } 263 }
257 #else 264 #else
258 // MSVC++ warns about switch statements without any cases. 265 // MSVC++ warns about switch statements without any cases.
259 NOTREACHED() << "Unexpected notification " << type; 266 NOTREACHED() << "Unexpected notification " << type;
260 #endif 267 #endif
261 } 268 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698