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

Side by Side Diff: chrome/browser/chromeos/input_method/candidate_window.cc

Issue 10828336: chromeos: Remove CROS_FONTS_USING_BCI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update media_galleries_dialog_views.cc Created 8 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
« no previous file with comments | « build/build_config.h ('k') | chrome/browser/chromeos/login/helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/chromeos/input_method/candidate_window.h" 5 #include "chrome/browser/chromeos/input_method/candidate_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 const SkColor kShortcutColor = SkColorSetRGB(0x61, 0x61, 0x61); 54 const SkColor kShortcutColor = SkColorSetRGB(0x61, 0x61, 0x61);
55 const SkColor kDisabledShortcutColor = SkColorSetRGB(0xcc, 0xcc, 0xcc); 55 const SkColor kDisabledShortcutColor = SkColorSetRGB(0xcc, 0xcc, 0xcc);
56 const SkColor kAnnotationColor = SkColorSetRGB(0x88, 0x88, 0x88); 56 const SkColor kAnnotationColor = SkColorSetRGB(0x88, 0x88, 0x88);
57 const SkColor kSelectedInfolistRowBackgroundColor = 57 const SkColor kSelectedInfolistRowBackgroundColor =
58 SkColorSetRGB(0xee, 0xee, 0xee); 58 SkColorSetRGB(0xee, 0xee, 0xee);
59 const SkColor kSelectedInfolistRowFrameColor = SkColorSetRGB(0xcc, 0xcc, 0xcc); 59 const SkColor kSelectedInfolistRowFrameColor = SkColorSetRGB(0xcc, 0xcc, 0xcc);
60 const SkColor kInfolistTitleBackgroundColor = SkColorSetRGB(0xdd, 0xdd, 0xdd); 60 const SkColor kInfolistTitleBackgroundColor = SkColorSetRGB(0xdd, 0xdd, 0xdd);
61 61
62 // We'll use a bigger font size, so Chinese characters are more readable 62 // We'll use a bigger font size, so Chinese characters are more readable
63 // in the candidate window. 63 // in the candidate window.
64 #if defined(CROS_FONTS_USING_BCI)
65 const int kFontSizeDelta = 1;
66 #else
67 const int kFontSizeDelta = 2; 64 const int kFontSizeDelta = 2;
68 #endif
69 65
70 // Currently the infolist window only supports Japanese font. 66 // Currently the infolist window only supports Japanese font.
71 #if defined(GOOGLE_CHROME_BUILD) 67 #if defined(GOOGLE_CHROME_BUILD)
72 const char kJapaneseFontName[] = "MotoyaG04Gothic"; 68 const char kJapaneseFontName[] = "MotoyaG04Gothic";
73 #else 69 #else
74 const char kJapaneseFontName[] = "IPAPGothic"; 70 const char kJapaneseFontName[] = "IPAPGothic";
75 #endif 71 #endif
76 72
77 // The minimum width of candidate labels in the vertical candidate 73 // The minimum width of candidate labels in the vertical candidate
78 // window. We use this value to prevent the candidate window from being 74 // window. We use this value to prevent the candidate window from being
(...skipping 1690 matching lines...) Expand 10 before | Expand all | Expand 10 after
1769 } 1765 }
1770 1766
1771 // static 1767 // static
1772 CandidateWindowController* 1768 CandidateWindowController*
1773 CandidateWindowController::CreateCandidateWindowController() { 1769 CandidateWindowController::CreateCandidateWindowController() {
1774 return new CandidateWindowControllerImpl; 1770 return new CandidateWindowControllerImpl;
1775 } 1771 }
1776 1772
1777 } // namespace input_method 1773 } // namespace input_method
1778 } // namespace chromeos 1774 } // namespace chromeos
OLDNEW
« no previous file with comments | « build/build_config.h ('k') | chrome/browser/chromeos/login/helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698