diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-28 21:49:31 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:00 +0100 |
| commit | ddb351dbec246cf1fab5ec20d2d5520909041de1 (patch) | |
| tree | 158e3fb57bdcac07c7f1e767fde3c70687c9fbb1 /chrome/common/font_descriptor_mac.h | |
| parent | 6b92e04f5f151c896e3088e86f70db7081009308 (diff) | |
| download | external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.zip external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.gz external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.bz2 | |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
Diffstat (limited to 'chrome/common/font_descriptor_mac.h')
| -rw-r--r-- | chrome/common/font_descriptor_mac.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/chrome/common/font_descriptor_mac.h b/chrome/common/font_descriptor_mac.h deleted file mode 100644 index 37b963e..0000000 --- a/chrome/common/font_descriptor_mac.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_COMMON_FONT_DESCRIPTOR_MAC_H_ -#define CHROME_COMMON_FONT_DESCRIPTOR_MAC_H_ -#pragma once - -#include "base/string16.h" - -#ifdef __OBJC__ -@class NSFont; -#else -class NSFont; -#endif - -// Container to allow serializing an NSFont over IPC. -struct FontDescriptor { - explicit FontDescriptor(NSFont* font); - - FontDescriptor() : font_point_size(0) {} - - // Return an autoreleased NSFont corresponding to the font description. - NSFont* nsFont() const; - - // Name of the font. - string16 font_name; - - // Size in points. - float font_point_size; -}; - -#endif // CHROME_COMMON_FONT_DESCRIPTOR_MAC_H_ |