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

Side by Side Diff: ui/message_center/cocoa/status_item_view.mm

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #import "ui/message_center/cocoa/status_item_view.h" 5 #import "ui/message_center/cocoa/status_item_view.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "grit/ui_resources.h"
11 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/resources/grit/ui_resources.h"
12 12
13 // The width of the status bar item when it's just the icon. 13 // The width of the status bar item when it's just the icon.
14 const CGFloat kStatusItemLength = 26; 14 const CGFloat kStatusItemLength = 26;
15 15
16 // The amount of space between the left and right edges and the content of the 16 // The amount of space between the left and right edges and the content of the
17 // status item. 17 // status item.
18 const CGFloat kMargin = 5; 18 const CGFloat kMargin = 5;
19 19
20 20
21 @interface MCStatusItemView (Private) 21 @interface MCStatusItemView (Private)
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 { IDR_TRAY_DO_NOT_DISTURB_EMPTY, 157 { IDR_TRAY_DO_NOT_DISTURB_EMPTY,
158 IDR_TRAY_DO_NOT_DISTURB_EMPTY_PRESSED }, 158 IDR_TRAY_DO_NOT_DISTURB_EMPTY_PRESSED },
159 { IDR_TRAY_DO_NOT_DISTURB_ATTENTION, 159 { IDR_TRAY_DO_NOT_DISTURB_ATTENTION,
160 IDR_TRAY_DO_NOT_DISTURB_ATTENTION_PRESSED }, 160 IDR_TRAY_DO_NOT_DISTURB_ATTENTION_PRESSED },
161 }, 161 },
162 }; 162 };
163 return kResourceIds[quietMode_][hasUnreadItems][highlight]; 163 return kResourceIds[quietMode_][hasUnreadItems][highlight];
164 } 164 }
165 165
166 @end 166 @end
OLDNEW
« no previous file with comments | « ui/message_center/cocoa/settings_entry_view.mm ('k') | ui/message_center/cocoa/tray_view_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698