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

Side by Side Diff: chrome/browser/chromeos/net/network_portal_notification_controller.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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/net/network_portal_notification_controller.h" 5 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/system_notifier.h" 8 #include "ash/system/system_notifier.h"
9 #include "ash/system/tray/system_tray_notifier.h" 9 #include "ash/system/tray/system_tray_notifier.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "chrome/browser/profiles/profile_manager.h" 18 #include "chrome/browser/profiles/profile_manager.h"
19 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 19 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
20 #include "chrome/browser/ui/singleton_tabs.h" 20 #include "chrome/browser/ui/singleton_tabs.h"
21 #include "chrome/grit/generated_resources.h"
22 #include "chrome/grit/theme_resources.h"
21 #include "chromeos/chromeos_switches.h" 23 #include "chromeos/chromeos_switches.h"
22 #include "chromeos/network/network_state.h" 24 #include "chromeos/network/network_state.h"
23 #include "components/captive_portal/captive_portal_detector.h" 25 #include "components/captive_portal/captive_portal_detector.h"
24 #include "grit/generated_resources.h"
25 #include "grit/theme_resources.h"
26 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/message_center/message_center.h" 28 #include "ui/message_center/message_center.h"
29 #include "ui/message_center/notification.h" 29 #include "ui/message_center/notification.h"
30 #include "ui/message_center/notification_types.h" 30 #include "ui/message_center/notification_types.h"
31 #include "ui/message_center/notifier_settings.h" 31 #include "ui/message_center/notifier_settings.h"
32 32
33 using message_center::Notification; 33 using message_center::Notification;
34 34
35 namespace chromeos { 35 namespace chromeos {
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 if (ash::Shell::HasInstance()) { 170 if (ash::Shell::HasInstance()) {
171 ash::Shell::GetInstance() 171 ash::Shell::GetInstance()
172 ->system_tray_notifier() 172 ->system_tray_notifier()
173 ->NotifyOnCaptivePortalDetected(network->path()); 173 ->NotifyOnCaptivePortalDetected(network->path());
174 } 174 }
175 175
176 message_center::MessageCenter::Get()->AddNotification(notification.Pass()); 176 message_center::MessageCenter::Get()->AddNotification(notification.Pass());
177 } 177 }
178 178
179 } // namespace chromeos 179 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller_browsertest.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698