chrome/browser/chromeos/status/data_promo_notification.cc - Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos.

Side by Side Diff: chrome/browser/chromeos/status/data_promo_notification.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/chromeos/profiles/multiprofiles_session_aborted_dialog.cc ('k') | chrome/browser/chromeos/status/network_menu.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/status/data_promo_notification.h"	5 #include "chrome/browser/chromeos/status/data_promo_notification.h"

6	6

	7 #include "ash/resources/grit/ash_resources.h"

7 #include "ash/system/chromeos/network/network_connect.h"	8 #include "ash/system/chromeos/network/network_connect.h"

8 #include "ash/system/system_notifier.h"	9 #include "ash/system/system_notifier.h"

9 #include "base/prefs/pref_registry_simple.h"	10 #include "base/prefs/pref_registry_simple.h"

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

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

12 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

13 #include "chrome/browser/chromeos/login/helper.h"	14 #include "chrome/browser/chromeos/login/helper.h"

14 #include "chrome/browser/chromeos/mobile_config.h"	15 #include "chrome/browser/chromeos/mobile_config.h"

15 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/profiles/profile_manager.h"	17 #include "chrome/browser/profiles/profile_manager.h"

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

18 #include "chrome/browser/ui/browser_list.h"	19 #include "chrome/browser/ui/browser_list.h"

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

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

21 #include "chrome/common/pref_names.h"	22 #include "chrome/common/pref_names.h"

	23 #include "chrome/grit/generated_resources.h"

	24 #include "chrome/grit/theme_resources.h"

22 #include "chromeos/login/login_state.h"	25 #include "chromeos/login/login_state.h"

23 #include "chromeos/network/device_state.h"	26 #include "chromeos/network/device_state.h"

24 #include "chromeos/network/network_connection_handler.h"	27 #include "chromeos/network/network_connection_handler.h"

25 #include "chromeos/network/network_event_log.h"	28 #include "chromeos/network/network_event_log.h"

26 #include "chromeos/network/network_state.h"	29 #include "chromeos/network/network_state.h"

27 #include "chromeos/network/network_state_handler.h"	30 #include "chromeos/network/network_state_handler.h"

28 #include "grit/ash_resources.h"

29 #include "grit/generated_resources.h"

30 #include "grit/theme_resources.h"

31 #include "third_party/cros_system_api/dbus/service_constants.h"	31 #include "third_party/cros_system_api/dbus/service_constants.h"

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

33 #include "ui/base/resource/resource_bundle.h"	33 #include "ui/base/resource/resource_bundle.h"

34 #include "ui/message_center/message_center.h"	34 #include "ui/message_center/message_center.h"

35 #include "ui/message_center/notification.h"	35 #include "ui/message_center/notification.h"

36 #include "ui/views/view.h"	36 #include "ui/views/view.h"

37 #include "ui/views/widget/widget.h"	37 #include "ui/views/widget/widget.h"

38	38

39 namespace chromeos {	39 namespace chromeos {

40	40

(...skipping 180 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
221 base::Bind(&NotificationClicked,	221 base::Bind(&NotificationClicked,

222 default_network->path(), info_url)));	222 default_network->path(), info_url)));

223	223

224 check_for_promo_ = false;	224 check_for_promo_ = false;

225 SetShow3gPromoNotification(false);	225 SetShow3gPromoNotification(false);

226 if (carrier_deal_promo_pref != kNotificationCountPrefDefault)	226 if (carrier_deal_promo_pref != kNotificationCountPrefDefault)

227 SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);	227 SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);

228 }	228 }

229	229

230 } // namespace chromeos	230 } // namespace chromeos

OLD	NEW