OLD | NEW |
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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <limits> | 9 #include <limits> |
10 | 10 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 #include "chrome/common/pref_names.h" | 67 #include "chrome/common/pref_names.h" |
68 #include "chrome/grit/chromium_strings.h" | 68 #include "chrome/grit/chromium_strings.h" |
69 #include "chrome/grit/generated_resources.h" | 69 #include "chrome/grit/generated_resources.h" |
70 #include "chrome/grit/theme_resources.h" | 70 #include "chrome/grit/theme_resources.h" |
71 #include "chromeos/chromeos_switches.h" | 71 #include "chromeos/chromeos_switches.h" |
72 #include "components/prefs/pref_service.h" | 72 #include "components/prefs/pref_service.h" |
73 #include "components/user_manager/user.h" | 73 #include "components/user_manager/user.h" |
74 #include "components/user_manager/user_manager.h" | 74 #include "components/user_manager/user_manager.h" |
75 #include "content/public/browser/notification_service.h" | 75 #include "content/public/browser/notification_service.h" |
76 #include "content/public/browser/user_metrics.h" | 76 #include "content/public/browser/user_metrics.h" |
77 #include "content/public/common/mojo_shell_connection.h" | 77 #include "content/public/common/service_manager_connection.h" |
78 #include "ui/app_list/presenter/app_list_presenter.h" | 78 #include "ui/app_list/presenter/app_list_presenter.h" |
79 #include "ui/aura/window.h" | 79 #include "ui/aura/window.h" |
80 #include "ui/base/ime/chromeos/input_method_manager.h" | 80 #include "ui/base/ime/chromeos/input_method_manager.h" |
81 #include "ui/base/l10n/l10n_util.h" | 81 #include "ui/base/l10n/l10n_util.h" |
82 #include "ui/base/resource/resource_bundle.h" | 82 #include "ui/base/resource/resource_bundle.h" |
83 | 83 |
84 using chromeos::AccessibilityManager; | 84 using chromeos::AccessibilityManager; |
85 | 85 |
86 namespace { | 86 namespace { |
87 | 87 |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 | 326 |
327 ChromeShellDelegate::ChromeShellDelegate() | 327 ChromeShellDelegate::ChromeShellDelegate() |
328 : shelf_delegate_(NULL) { | 328 : shelf_delegate_(NULL) { |
329 PlatformInit(); | 329 PlatformInit(); |
330 } | 330 } |
331 | 331 |
332 ChromeShellDelegate::~ChromeShellDelegate() { | 332 ChromeShellDelegate::~ChromeShellDelegate() { |
333 } | 333 } |
334 | 334 |
335 shell::Connector* ChromeShellDelegate::GetShellConnector() const { | 335 shell::Connector* ChromeShellDelegate::GetShellConnector() const { |
336 return content::MojoShellConnection::GetForProcess()->GetConnector(); | 336 return content::ServiceManagerConnection::GetForProcess()->GetConnector(); |
337 } | 337 } |
338 | 338 |
339 bool ChromeShellDelegate::IsFirstRunAfterBoot() const { | 339 bool ChromeShellDelegate::IsFirstRunAfterBoot() const { |
340 return base::CommandLine::ForCurrentProcess()->HasSwitch( | 340 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
341 chromeos::switches::kFirstExecAfterBoot); | 341 chromeos::switches::kFirstExecAfterBoot); |
342 } | 342 } |
343 | 343 |
344 bool ChromeShellDelegate::IsMultiProfilesEnabled() const { | 344 bool ChromeShellDelegate::IsMultiProfilesEnabled() const { |
345 if (!profiles::IsMultipleProfilesEnabled()) | 345 if (!profiles::IsMultipleProfilesEnabled()) |
346 return false; | 346 return false; |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
556 NOTREACHED() << "Unexpected notification " << type; | 556 NOTREACHED() << "Unexpected notification " << type; |
557 } | 557 } |
558 } | 558 } |
559 | 559 |
560 void ChromeShellDelegate::PlatformInit() { | 560 void ChromeShellDelegate::PlatformInit() { |
561 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 561 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
562 content::NotificationService::AllSources()); | 562 content::NotificationService::AllSources()); |
563 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, | 563 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, |
564 content::NotificationService::AllSources()); | 564 content::NotificationService::AllSources()); |
565 } | 565 } |
OLD | NEW |