chrome/browser/chromeos/app_mode/startup_app_launcher.cc - Issue 18640003: Updates some includes of chrome_notification_types.h

Side by Side Diff: chrome/browser/chromeos/app_mode/startup_app_launcher.cc

Issue 18640003: Updates some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 5 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/chromeos/app_mode/kiosk_app_manager.cc ('k') | chrome/browser/chromeos/attestation/attestation_policy_observer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/chromeos/app_mode/startup_app_launcher.h"	5 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/files/file_path.h"	9 #include "base/files/file_path.h"

10 #include "base/json/json_file_value_serializer.h"	10 #include "base/json/json_file_value_serializer.h"

11 #include "base/path_service.h"	11 #include "base/path_service.h"

12 #include "base/time/time.h"	12 #include "base/time/time.h"

13 #include "base/values.h"	13 #include "base/values.h"

	14 #include "chrome/browser/chrome_notification_types.h"

14 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"	15 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"

15 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"	16 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"

16 #include "chrome/browser/chromeos/login/user_manager.h"	17 #include "chrome/browser/chromeos/login/user_manager.h"

17 #include "chrome/browser/chromeos/ui/app_launch_view.h"	18 #include "chrome/browser/chromeos/ui/app_launch_view.h"

18 #include "chrome/browser/extensions/extension_service.h"	19 #include "chrome/browser/extensions/extension_service.h"

19 #include "chrome/browser/extensions/extension_system.h"	20 #include "chrome/browser/extensions/extension_system.h"

20 #include "chrome/browser/extensions/webstore_startup_installer.h"	21 #include "chrome/browser/extensions/webstore_startup_installer.h"

21 #include "chrome/browser/lifetime/application_lifetime.h"	22 #include "chrome/browser/lifetime/application_lifetime.h"

22 #include "chrome/browser/signin/token_service.h"	23 #include "chrome/browser/signin/token_service.h"

23 #include "chrome/browser/signin/token_service_factory.h"	24 #include "chrome/browser/signin/token_service_factory.h"

24 #include "chrome/browser/ui/extensions/application_launch.h"	25 #include "chrome/browser/ui/extensions/application_launch.h"

25 #include "chrome/common/chrome_notification_types.h"

26 #include "chrome/common/chrome_paths.h"	26 #include "chrome/common/chrome_paths.h"

27 #include "chrome/common/chrome_switches.h"	27 #include "chrome/common/chrome_switches.h"

28 #include "chrome/common/extensions/extension.h"	28 #include "chrome/common/extensions/extension.h"

29 #include "chrome/common/extensions/manifest_handlers/kiosk_enabled_info.h"	29 #include "chrome/common/extensions/manifest_handlers/kiosk_enabled_info.h"

30 #include "content/public/browser/browser_thread.h"	30 #include "content/public/browser/browser_thread.h"

31 #include "content/public/browser/notification_details.h"	31 #include "content/public/browser/notification_details.h"

32 #include "content/public/browser/notification_service.h"	32 #include "content/public/browser/notification_service.h"

33 #include "content/public/browser/notification_source.h"	33 #include "content/public/browser/notification_source.h"

34 #include "google_apis/gaia/gaia_auth_consumer.h"	34 #include "google_apis/gaia/gaia_auth_consumer.h"

35 #include "google_apis/gaia/gaia_constants.h"	35 #include "google_apis/gaia/gaia_constants.h"

(...skipping 301 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
337 if (event->key_code() != ui::VKEY_S \|\|	337 if (event->key_code() != ui::VKEY_S \|\|

338 !(event->flags() & ui::EF_CONTROL_DOWN) \|\|	338 !(event->flags() & ui::EF_CONTROL_DOWN) \|\|

339 !(event->flags() & ui::EF_ALT_DOWN)) {	339 !(event->flags() & ui::EF_ALT_DOWN)) {

340 return;	340 return;

341 }	341 }

342	342

343 OnLaunchFailure(KioskAppLaunchError::USER_CANCEL);	343 OnLaunchFailure(KioskAppLaunchError::USER_CANCEL);

344 }	344 }

345	345

346 } // namespace chromeos	346 } // namespace chromeos

OLD	NEW