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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/ui/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/accelerators/magnifier_key_scroller.h" 7 #include "ash/accelerators/magnifier_key_scroller.h"
8 #include "ash/accelerators/spoken_feedback_toggler.h" 8 #include "ash/accelerators/spoken_feedback_toggler.h"
9 #include "ash/accessibility_delegate.h" 9 #include "ash/accessibility_delegate.h"
10 #include "ash/wm/mru_window_tracker.h" 10 #include "ash/wm/mru_window_tracker.h"
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/speech/tts_controller.h" 26 #include "chrome/browser/speech/tts_controller.h"
27 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" 27 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
28 #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h" 28 #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h"
29 #include "chrome/browser/ui/ash/media_delegate_chromeos.h" 29 #include "chrome/browser/ui/ash/media_delegate_chromeos.h"
30 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" 30 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
31 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 31 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
32 #include "chrome/browser/ui/browser.h" 32 #include "chrome/browser/ui/browser.h"
33 #include "chrome/browser/ui/browser_finder.h" 33 #include "chrome/browser/ui/browser_finder.h"
34 #include "chrome/browser/ui/browser_window.h" 34 #include "chrome/browser/ui/browser_window.h"
35 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
36 #include "chrome/grit/generated_resources.h"
36 #include "chromeos/chromeos_switches.h" 37 #include "chromeos/chromeos_switches.h"
37 #include "chromeos/ime/input_method_manager.h" 38 #include "chromeos/ime/input_method_manager.h"
38 #include "content/public/browser/notification_service.h" 39 #include "content/public/browser/notification_service.h"
39 #include "content/public/browser/user_metrics.h" 40 #include "content/public/browser/user_metrics.h"
40 #include "grit/generated_resources.h"
41 #include "ui/aura/window.h" 41 #include "ui/aura/window.h"
42 #include "ui/base/l10n/l10n_util.h" 42 #include "ui/base/l10n/l10n_util.h"
43 43
44 namespace { 44 namespace {
45 45
46 void InitAfterSessionStart() { 46 void InitAfterSessionStart() {
47 // Restore focus after the user session is started. It's needed because some 47 // Restore focus after the user session is started. It's needed because some
48 // windows can be opened in background while login UI is still active because 48 // windows can be opened in background while login UI is still active because
49 // we currently restore browser windows before login UI is deleted. 49 // we currently restore browser windows before login UI is deleted.
50 ash::Shell* shell = ash::Shell::GetInstance(); 50 ash::Shell* shell = ash::Shell::GetInstance();
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 } 280 }
281 281
282 void ChromeShellDelegate::PlatformInit() { 282 void ChromeShellDelegate::PlatformInit() {
283 registrar_.Add(this, 283 registrar_.Add(this,
284 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 284 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
285 content::NotificationService::AllSources()); 285 content::NotificationService::AllSources());
286 registrar_.Add(this, 286 registrar_.Add(this,
287 chrome::NOTIFICATION_SESSION_STARTED, 287 chrome::NOTIFICATION_SESSION_STARTED,
288 content::NotificationService::AllSources()); 288 content::NotificationService::AllSources());
289 } 289 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698