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

Side by Side Diff: chrome/browser/chromeos/status/data_promo_notification.cc

Issue 514493002: Cleanup: Remove unneeded grit include in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@grit_clean_chromium_strings_401588_a
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
OLDNEW
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/resources/grit/ash_resources.h"
8 #include "ash/system/chromeos/network/network_connect.h" 8 #include "ash/system/chromeos/network/network_connect.h"
9 #include "ash/system/system_notifier.h" 9 #include "ash/system/system_notifier.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.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/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chromeos/login/helper.h" 14 #include "chrome/browser/chromeos/login/helper.h"
15 #include "chrome/browser/chromeos/mobile_config.h" 15 #include "chrome/browser/chromeos/mobile_config.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/profiles/profile_manager.h" 17 #include "chrome/browser/profiles/profile_manager.h"
18 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_list.h" 19 #include "chrome/browser/ui/browser_list.h"
20 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 20 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
21 #include "chrome/browser/ui/singleton_tabs.h" 21 #include "chrome/browser/ui/singleton_tabs.h"
22 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
23 #include "chrome/grit/generated_resources.h" 23 #include "chrome/grit/generated_resources.h"
24 #include "chrome/grit/theme_resources.h"
25 #include "chromeos/login/login_state.h" 24 #include "chromeos/login/login_state.h"
26 #include "chromeos/network/device_state.h" 25 #include "chromeos/network/device_state.h"
27 #include "chromeos/network/network_connection_handler.h" 26 #include "chromeos/network/network_connection_handler.h"
28 #include "chromeos/network/network_event_log.h" 27 #include "chromeos/network/network_event_log.h"
29 #include "chromeos/network/network_state.h" 28 #include "chromeos/network/network_state.h"
30 #include "chromeos/network/network_state_handler.h" 29 #include "chromeos/network/network_state_handler.h"
31 #include "third_party/cros_system_api/dbus/service_constants.h" 30 #include "third_party/cros_system_api/dbus/service_constants.h"
32 #include "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/resource/resource_bundle.h" 32 #include "ui/base/resource/resource_bundle.h"
34 #include "ui/message_center/message_center.h" 33 #include "ui/message_center/message_center.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 if (NetworkHandler::Get()->network_connection_handler()-> 179 if (NetworkHandler::Get()->network_connection_handler()->
181 HasPendingConnectRequest()) 180 HasPendingConnectRequest())
182 return; 181 return;
183 182
184 int carrier_deal_promo_pref = kNotificationCountPrefDefault; 183 int carrier_deal_promo_pref = kNotificationCountPrefDefault;
185 const MobileConfig::CarrierDeal* deal = NULL; 184 const MobileConfig::CarrierDeal* deal = NULL;
186 const MobileConfig::Carrier* carrier = GetCarrier(default_network); 185 const MobileConfig::Carrier* carrier = GetCarrier(default_network);
187 if (carrier) 186 if (carrier)
188 deal = GetCarrierDeal(carrier); 187 deal = GetCarrierDeal(carrier);
189 188
190 base::string16 message = l10n_util::GetStringUTF16(IDS_3G_NOTIFICATION_MESSAGE ); 189 base::string16 message =
190 l10n_util::GetStringUTF16(IDS_3G_NOTIFICATION_MESSAGE);
191 std::string info_url; 191 std::string info_url;
192 if (deal) { 192 if (deal) {
193 carrier_deal_promo_pref = GetCarrierDealPromoShown(); 193 carrier_deal_promo_pref = GetCarrierDealPromoShown();
194 const std::string locale = g_browser_process->GetApplicationLocale(); 194 const std::string locale = g_browser_process->GetApplicationLocale();
195 std::string deal_text = 195 std::string deal_text =
196 deal->GetLocalizedString(locale, "notification_text"); 196 deal->GetLocalizedString(locale, "notification_text");
197 message = base::UTF8ToUTF16(deal_text + "\n\n") + message; 197 message = base::UTF8ToUTF16(deal_text + "\n\n") + message;
198 info_url = deal->info_url(); 198 info_url = deal->info_url();
199 if (info_url.empty() && carrier) 199 if (info_url.empty() && carrier)
200 info_url = carrier->top_up_url(); 200 info_url = carrier->top_up_url();
(...skipping 20 matching lines...) Expand all
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698