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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/star_decoration.mm

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/ui/cocoa/location_bar/star_decoration.h" 5 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/command_updater.h" 8 #include "chrome/browser/command_updater.h"
9 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 9 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
10 #include "grit/generated_resources.h" 10 #include "grit/generated_resources.h"
11 #include "grit/theme_resources.h" 11 #include "grit/theme_resources.h"
12 #include "grit/theme_resources_standard.h"
13 #include "ui/base/l10n/l10n_util_mac.h" 12 #include "ui/base/l10n/l10n_util_mac.h"
14 13
15 namespace { 14 namespace {
16 15
17 // The info-bubble point should look like it points to the point 16 // The info-bubble point should look like it points to the point
18 // between the star's lower tips. The popup should be where the 17 // between the star's lower tips. The popup should be where the
19 // Omnibox popup ends up (2px below field). Determined via Pixie.app 18 // Omnibox popup ends up (2px below field). Determined via Pixie.app
20 // magnification. 19 // magnification.
21 const CGFloat kStarPointYOffset = 2.0; 20 const CGFloat kStarPointYOffset = 2.0;
22 21
(...skipping 26 matching lines...) Expand all
49 } 48 }
50 49
51 bool StarDecoration::OnMousePressed(NSRect frame) { 50 bool StarDecoration::OnMousePressed(NSRect frame) {
52 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); 51 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
53 return true; 52 return true;
54 } 53 }
55 54
56 NSString* StarDecoration::GetToolTip() { 55 NSString* StarDecoration::GetToolTip() {
57 return tooltip_.get(); 56 return tooltip_.get();
58 } 57 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698