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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comments Created 9 years, 8 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/location_bar/location_bar_view.h" 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h" 31 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
32 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h" 32 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
33 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" 33 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
34 #include "chrome/browser/ui/views/location_bar/star_view.h" 34 #include "chrome/browser/ui/views/location_bar/star_view.h"
35 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
36 #include "chrome/common/pref_names.h" 36 #include "chrome/common/pref_names.h"
37 #include "content/browser/renderer_host/render_widget_host_view.h" 37 #include "content/browser/renderer_host/render_widget_host_view.h"
38 #include "content/common/notification_service.h" 38 #include "content/common/notification_service.h"
39 #include "grit/generated_resources.h" 39 #include "grit/generated_resources.h"
40 #include "grit/theme_resources.h" 40 #include "grit/theme_resources.h"
41 #include "grit/theme_resources_standard.h"
41 #include "ui/base/accessibility/accessible_view_state.h" 42 #include "ui/base/accessibility/accessible_view_state.h"
42 #include "ui/base/dragdrop/drag_drop_types.h" 43 #include "ui/base/dragdrop/drag_drop_types.h"
43 #include "ui/base/l10n/l10n_util.h" 44 #include "ui/base/l10n/l10n_util.h"
44 #include "ui/base/resource/resource_bundle.h" 45 #include "ui/base/resource/resource_bundle.h"
45 #include "ui/base/theme_provider.h" 46 #include "ui/base/theme_provider.h"
46 #include "ui/gfx/canvas_skia.h" 47 #include "ui/gfx/canvas_skia.h"
47 #include "ui/gfx/color_utils.h" 48 #include "ui/gfx/color_utils.h"
48 #include "ui/gfx/skia_util.h" 49 #include "ui/gfx/skia_util.h"
49 #include "views/controls/label.h" 50 #include "views/controls/label.h"
50 #include "views/drag_utils.h" 51 #include "views/drag_utils.h"
(...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 Update(NULL); 1200 Update(NULL);
1200 } 1201 }
1201 } 1202 }
1202 1203
1203 #if defined(OS_WIN) 1204 #if defined(OS_WIN)
1204 bool LocationBarView::HasValidSuggestText() const { 1205 bool LocationBarView::HasValidSuggestText() const {
1205 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() && 1206 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
1206 !suggested_text_view_->GetText().empty(); 1207 !suggested_text_view_->GetText().empty();
1207 } 1208 }
1208 #endif 1209 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.cc ('k') | chrome/browser/ui/views/location_bar/star_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698