chrome/browser/ui/views/message_center/web_notification_tray.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

Side by Side Diff: chrome/browser/ui/views/message_center/web_notification_tray.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/location_bar/zoom_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_result_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/ui/views/message_center/web_notification_tray.h"	5 #include "chrome/browser/ui/views/message_center/web_notification_tray.h"

6	6

7 #include "base/i18n/number_formatting.h"	7 #include "base/i18n/number_formatting.h"

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

9 #include "base/strings/string16.h"	9 #include "base/strings/string16.h"

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

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

12 #include "chrome/browser/status_icons/status_icon.h"	12 #include "chrome/browser/status_icons/status_icon.h"

13 #include "chrome/browser/status_icons/status_icon_menu_model.h"	13 #include "chrome/browser/status_icons/status_icon_menu_model.h"

14 #include "chrome/browser/status_icons/status_tray.h"	14 #include "chrome/browser/status_icons/status_tray.h"

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

	16 #include "chrome/grit/chromium_strings.h"

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

16 #include "content/public/browser/notification_service.h"	18 #include "content/public/browser/notification_service.h"

17 #include "grit/chromium_strings.h"

18 #include "grit/generated_resources.h"

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

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

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

22 #include "ui/gfx/canvas.h"	22 #include "ui/gfx/canvas.h"

23 #include "ui/gfx/image/image_skia_operations.h"	23 #include "ui/gfx/image/image_skia_operations.h"

24 #include "ui/gfx/rect.h"	24 #include "ui/gfx/rect.h"

25 #include "ui/gfx/screen.h"	25 #include "ui/gfx/screen.h"

26 #include "ui/gfx/size.h"	26 #include "ui/gfx/size.h"

27 #include "ui/message_center/message_center_tray.h"	27 #include "ui/message_center/message_center_tray.h"

28 #include "ui/message_center/message_center_tray_delegate.h"	28 #include "ui/message_center/message_center_tray_delegate.h"

(...skipping 370 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
399 status_icon_menu_ = menu.get();	399 status_icon_menu_ = menu.get();

400 status_icon->SetContextMenu(menu.Pass());	400 status_icon->SetContextMenu(menu.Pass());

401 }	401 }

402	402

403 MessageCenterWidgetDelegate*	403 MessageCenterWidgetDelegate*

404 WebNotificationTray::GetMessageCenterWidgetDelegateForTest() {	404 WebNotificationTray::GetMessageCenterWidgetDelegateForTest() {

405 return message_center_delegate_;	405 return message_center_delegate_;

406 }	406 }

407	407

408 } // namespace message_center	408 } // namespace message_center

OLD	NEW