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

Side by Side Diff: chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc

Issue 6676030: WinDDK ATL and MSVC express compatability (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: common.gypi: use gyp defines instead of direct compiler flags; _SECURE_ATL conditional handling Created 9 years, 9 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 #include "chrome/browser/ui/views/autocomplete/autocomplete_result_view.h" 5 #include "chrome/browser/ui/views/autocomplete/autocomplete_result_view.h"
6 6
7 #include <atlbase.h>
M-A Ruel 2011/03/17 14:01:24 You cannot do this, atlbase.h doesn't exist on mac
RN 2011/03/17 16:50:27 Nice catch. Done here and in the other source file
8 #include <atlwin.h>
9
7 #include "base/i18n/bidi_line_iterator.h" 10 #include "base/i18n/bidi_line_iterator.h"
8 #include "chrome/browser/ui/views/autocomplete/autocomplete_result_view_model.h" 11 #include "chrome/browser/ui/views/autocomplete/autocomplete_result_view_model.h"
9 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
10 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
11 #include "grit/theme_resources.h" 14 #include "grit/theme_resources.h"
12 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
13 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
14 #include "ui/base/text/text_elider.h" 17 #include "ui/base/text/text_elider.h"
15 #include "ui/gfx/canvas_skia.h" 18 #include "ui/gfx/canvas_skia.h"
16 #include "ui/gfx/color_utils.h" 19 #include "ui/gfx/color_utils.h"
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 // * It's normal, and will be able to draw successfully with the 492 // * It's normal, and will be able to draw successfully with the
490 // ellipsis we'll append to it, or 493 // ellipsis we'll append to it, or
491 // * It is also bold, in which case we don't want to fall back 494 // * It is also bold, in which case we don't want to fall back
492 // to a normal ellipsis anyway (see comment above). 495 // to a normal ellipsis anyway (see comment above).
493 } 496 }
494 } 497 }
495 498
496 // We couldn't draw anything. 499 // We couldn't draw anything.
497 runs->clear(); 500 runs->clear();
498 } 501 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698