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

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

Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash41_scroll_end_effect
Patch Set: Created 6 years, 1 month 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/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/content_support/gpu_support_impl.h" 7 #include "ash/content_support/gpu_support_impl.h"
8 #include "ash/magnifier/magnifier_constants.h"
9 #include "ash/wm/window_state.h" 8 #include "ash/wm/window_state.h"
10 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
11 #include "chrome/browser/app_mode/app_mode_utils.h" 10 #include "chrome/browser/app_mode/app_mode_utils.h"
12 #include "chrome/browser/lifetime/application_lifetime.h" 11 #include "chrome/browser/lifetime/application_lifetime.h"
13 #include "chrome/browser/profiles/profile_manager.h" 12 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/profiles/profiles_state.h" 13 #include "chrome/browser/profiles/profiles_state.h"
15 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" 14 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
16 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h" 15 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"
17 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h" 16 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
18 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 155
157 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( 156 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
158 ash::VirtualKeyboardStateObserver* observer) { 157 ash::VirtualKeyboardStateObserver* observer) {
159 keyboard_state_observer_list_.AddObserver(observer); 158 keyboard_state_observer_list_.AddObserver(observer);
160 } 159 }
161 160
162 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( 161 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
163 ash::VirtualKeyboardStateObserver* observer) { 162 ash::VirtualKeyboardStateObserver* observer) {
164 keyboard_state_observer_list_.RemoveObserver(observer); 163 keyboard_state_observer_list_.RemoveObserver(observer);
165 } 164 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698