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

Side by Side Diff: chrome/browser/chromeos/accessibility/accessibility_manager.cc

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build Created 6 years, 4 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/DEPS ('k') | chrome/browser/chromeos/app_mode/certificate_manager_dialog.cc » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/accessibility/accessibility_manager.h" 5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
6 6
7 #include "ash/audio/sounds.h" 7 #include "ash/audio/sounds.h"
8 #include "ash/autoclick/autoclick_controller.h" 8 #include "ash/autoclick/autoclick_controller.h"
9 #include "ash/high_contrast/high_contrast_controller.h" 9 #include "ash/high_contrast/high_contrast_controller.h"
10 #include "ash/metrics/user_metrics_recorder.h" 10 #include "ash/metrics/user_metrics_recorder.h"
(...skipping 25 matching lines...) Expand all
36 #include "chrome/browser/chromeos/profiles/profile_helper.h" 36 #include "chrome/browser/chromeos/profiles/profile_helper.h"
37 #include "chrome/browser/extensions/component_loader.h" 37 #include "chrome/browser/extensions/component_loader.h"
38 #include "chrome/browser/extensions/extension_service.h" 38 #include "chrome/browser/extensions/extension_service.h"
39 #include "chrome/browser/profiles/profile.h" 39 #include "chrome/browser/profiles/profile.h"
40 #include "chrome/browser/profiles/profile_manager.h" 40 #include "chrome/browser/profiles/profile_manager.h"
41 #include "chrome/common/chrome_paths.h" 41 #include "chrome/common/chrome_paths.h"
42 #include "chrome/common/extensions/api/accessibility_private.h" 42 #include "chrome/common/extensions/api/accessibility_private.h"
43 #include "chrome/common/extensions/extension_constants.h" 43 #include "chrome/common/extensions/extension_constants.h"
44 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" 44 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
45 #include "chrome/common/pref_names.h" 45 #include "chrome/common/pref_names.h"
46 #include "chrome/grit/browser_resources.h"
47 #include "chrome/grit/generated_resources.h"
46 #include "chromeos/audio/chromeos_sounds.h" 48 #include "chromeos/audio/chromeos_sounds.h"
47 #include "chromeos/ime/input_method_manager.h" 49 #include "chromeos/ime/input_method_manager.h"
48 #include "chromeos/login/login_state.h" 50 #include "chromeos/login/login_state.h"
49 #include "content/public/browser/browser_accessibility_state.h" 51 #include "content/public/browser/browser_accessibility_state.h"
50 #include "content/public/browser/browser_thread.h" 52 #include "content/public/browser/browser_thread.h"
51 #include "content/public/browser/notification_details.h" 53 #include "content/public/browser/notification_details.h"
52 #include "content/public/browser/notification_service.h" 54 #include "content/public/browser/notification_service.h"
53 #include "content/public/browser/notification_source.h" 55 #include "content/public/browser/notification_source.h"
54 #include "content/public/browser/render_process_host.h" 56 #include "content/public/browser/render_process_host.h"
55 #include "content/public/browser/render_view_host.h" 57 #include "content/public/browser/render_view_host.h"
56 #include "content/public/browser/web_contents.h" 58 #include "content/public/browser/web_contents.h"
57 #include "content/public/browser/web_ui.h" 59 #include "content/public/browser/web_ui.h"
58 #include "extensions/browser/extension_system.h" 60 #include "extensions/browser/extension_system.h"
59 #include "extensions/browser/file_reader.h" 61 #include "extensions/browser/file_reader.h"
60 #include "extensions/common/extension.h" 62 #include "extensions/common/extension.h"
61 #include "extensions/common/extension_messages.h" 63 #include "extensions/common/extension_messages.h"
62 #include "extensions/common/extension_resource.h" 64 #include "extensions/common/extension_resource.h"
63 #include "grit/browser_resources.h"
64 #include "grit/generated_resources.h"
65 #include "media/audio/sounds/sounds_manager.h" 65 #include "media/audio/sounds/sounds_manager.h"
66 #include "ui/base/resource/resource_bundle.h" 66 #include "ui/base/resource/resource_bundle.h"
67 #include "ui/keyboard/keyboard_controller.h" 67 #include "ui/keyboard/keyboard_controller.h"
68 #include "ui/keyboard/keyboard_util.h" 68 #include "ui/keyboard/keyboard_util.h"
69 69
70 using content::BrowserThread; 70 using content::BrowserThread;
71 using content::RenderViewHost; 71 using content::RenderViewHost;
72 using extensions::api::braille_display_private::BrailleController; 72 using extensions::api::braille_display_private::BrailleController;
73 using extensions::api::braille_display_private::DisplayState; 73 using extensions::api::braille_display_private::DisplayState;
74 using extensions::api::braille_display_private::KeyEvent; 74 using extensions::api::braille_display_private::KeyEvent;
(...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after
1105 chrome_vox_loaded_on_lock_screen_; 1105 chrome_vox_loaded_on_lock_screen_;
1106 } 1106 }
1107 1107
1108 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) { 1108 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) {
1109 // Do any teardown work needed immediately after ChromeVox actually unloads. 1109 // Do any teardown work needed immediately after ChromeVox actually unloads.
1110 if (system_sounds_enabled_) 1110 if (system_sounds_enabled_)
1111 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED); 1111 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED);
1112 } 1112 }
1113 1113
1114 } // namespace chromeos 1114 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chromeos/app_mode/certificate_manager_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698