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

Side by Side Diff: chrome/browser/chromeos/locale_change_guard.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/input_method/browser_state_monitor.cc ('k') | chrome/browser/chromeos/policy/device_status_collector.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 (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/chromeos/locale_change_guard.h"	5 #include "chrome/browser/chromeos/locale_change_guard.h"

6	6

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

8 #include "ash/system/tray/system_tray.h"	8 #include "ash/system/tray/system_tray.h"

9 #include "ash/system/tray/system_tray_notifier.h"	9 #include "ash/system/tray/system_tray_notifier.h"

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "base/prefs/pref_service.h"	11 #include "base/prefs/pref_service.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "chrome/app/chrome_command_ids.h"	13 #include "chrome/app/chrome_command_ids.h"

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

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

15 #include "chrome/browser/chromeos/settings/device_settings_service.h"	16 #include "chrome/browser/chromeos/settings/device_settings_service.h"

16 #include "chrome/browser/lifetime/application_lifetime.h"	17 #include "chrome/browser/lifetime/application_lifetime.h"

17 #include "chrome/browser/notifications/notification_delegate.h"	18 #include "chrome/browser/notifications/notification_delegate.h"

18 #include "chrome/browser/profiles/profile.h"	19 #include "chrome/browser/profiles/profile.h"

19 #include "chrome/browser/ui/browser.h"	20 #include "chrome/browser/ui/browser.h"

20 #include "chrome/browser/ui/browser_commands.h"	21 #include "chrome/browser/ui/browser_commands.h"

21 #include "chrome/browser/ui/host_desktop.h"	22 #include "chrome/browser/ui/host_desktop.h"

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

23 #include "chrome/common/pref_names.h"	23 #include "chrome/common/pref_names.h"

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

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

26 #include "content/public/browser/user_metrics.h"	26 #include "content/public/browser/user_metrics.h"

27 #include "content/public/browser/web_contents.h"	27 #include "content/public/browser/web_contents.h"

28 #include "grit/generated_resources.h"	28 #include "grit/generated_resources.h"

29 #include "grit/theme_resources.h"	29 #include "grit/theme_resources.h"

30 #include "ui/base/l10n/l10n_util.h"	30 #include "ui/base/l10n/l10n_util.h"

31	31

32 using content::UserMetricsAction;	32 using content::UserMetricsAction;

(...skipping 204 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
237 if (by_user)	237 if (by_user)

238 master_->AcceptLocaleChange();	238 master_->AcceptLocaleChange();

239 }	239 }

240	240

241 std::string LocaleChangeGuard::Delegate::id() const {	241 std::string LocaleChangeGuard::Delegate::id() const {

242 // Arbitrary unique Id.	242 // Arbitrary unique Id.

243 return "8c386938-1e3f-11e0-ac7b-18a90520e2e5";	243 return "8c386938-1e3f-11e0-ac7b-18a90520e2e5";

244 }	244 }

245	245

246 } // namespace chromeos	246 } // namespace chromeos

OLD	NEW