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

Side by Side Diff: ash/system/web_notification/web_notification_tray.cc

Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 (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 "ash/system/web_notification/web_notification_tray.h" 5 #include "ash/system/web_notification/web_notification_tray.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf_layout_manager.h" 8 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
11 #include "ash/system/status_area_widget.h" 11 #include "ash/system/status_area_widget.h"
12 #include "ash/system/tray/system_tray.h" 12 #include "ash/system/tray/system_tray.h"
13 #include "ash/system/tray/tray_background_view.h" 13 #include "ash/system/tray/tray_background_view.h"
14 #include "ash/system/tray/tray_bubble_wrapper.h" 14 #include "ash/system/tray/tray_bubble_wrapper.h"
15 #include "ash/system/tray/tray_constants.h" 15 #include "ash/system/tray/tray_constants.h"
16 #include "ash/system/tray/tray_utils.h" 16 #include "ash/system/tray/tray_utils.h"
17 #include "base/auto_reset.h" 17 #include "base/auto_reset.h"
18 #include "base/i18n/number_formatting.h" 18 #include "base/i18n/number_formatting.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
20 #include "grit/ash_resources.h" 20 #include "grit/ash_resources.h"
21 #include "grit/ash_strings.h" 21 #include "grit/ash_strings.h"
22 #include "grit/ui_strings.h" 22 #include "grit/ui_strings.h"
23 #include "ui/aura/root_window.h" 23 #include "ui/aura/root_window.h"
24 #include "ui/aura/window.h" 24 #include "ui/aura/window.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/resource/resource_bundle.h" 26 #include "ui/base/resource/resource_bundle.h"
27 #include "ui/gfx/screen.h" 27 #include "ui/gfx/screen.h"
28 #include "ui/message_center/message_center_tray_delegate.h" 28 #include "ui/message_center/message_center_tray_delegate.h"
29 #include "ui/message_center/message_center_util.h" 29 #include "ui/message_center/message_center_util.h"
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 516
517 message_center::MessagePopupBubble* 517 message_center::MessagePopupBubble*
518 WebNotificationTray::GetPopupBubbleForTest() { 518 WebNotificationTray::GetPopupBubbleForTest() {
519 if (!popup_bubble()) 519 if (!popup_bubble())
520 return NULL; 520 return NULL;
521 return static_cast<message_center::MessagePopupBubble*>( 521 return static_cast<message_center::MessagePopupBubble*>(
522 popup_bubble()->bubble()); 522 popup_bubble()->bubble());
523 } 523 }
524 524
525 } // namespace ash 525 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | ash/system/web_notification/web_notification_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698