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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 17 matching lines...) Expand all
28 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h" 28 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
29 #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h" 29 #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h"
30 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" 30 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
31 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 31 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
32 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h" 32 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
33 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h" 33 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
34 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" 34 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
35 #include "chrome/browser/ui/views/location_bar/star_view.h" 35 #include "chrome/browser/ui/views/location_bar/star_view.h"
36 #include "chrome/common/chrome_switches.h" 36 #include "chrome/common/chrome_switches.h"
37 #include "chrome/common/notification_service.h" 37 #include "chrome/common/notification_service.h"
38 #include "gfx/canvas_skia.h"
39 #include "gfx/color_utils.h"
40 #include "gfx/skia_util.h"
41 #include "grit/generated_resources.h" 38 #include "grit/generated_resources.h"
42 #include "grit/theme_resources.h" 39 #include "grit/theme_resources.h"
43 #include "ui/base/dragdrop/drag_drop_types.h" 40 #include "ui/base/dragdrop/drag_drop_types.h"
44 #include "ui/base/l10n/l10n_util.h" 41 #include "ui/base/l10n/l10n_util.h"
45 #include "ui/base/resource/resource_bundle.h" 42 #include "ui/base/resource/resource_bundle.h"
46 #include "ui/base/theme_provider.h" 43 #include "ui/base/theme_provider.h"
44 #include "ui/gfx/canvas_skia.h"
45 #include "ui/gfx/color_utils.h"
46 #include "ui/gfx/skia_util.h"
47 #include "views/controls/label.h" 47 #include "views/controls/label.h"
48 #include "views/drag_utils.h" 48 #include "views/drag_utils.h"
49 49
50 #if defined(OS_WIN) 50 #if defined(OS_WIN)
51 #include "chrome/browser/ui/views/location_bar/suggested_text_view.h" 51 #include "chrome/browser/ui/views/location_bar/suggested_text_view.h"
52 #include "chrome/browser/ui/views/first_run_bubble.h" 52 #include "chrome/browser/ui/views/first_run_bubble.h"
53 #endif 53 #endif
54 54
55 using views::View; 55 using views::View;
56 56
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after
1222 template_url_model_ = NULL; 1222 template_url_model_ = NULL;
1223 ShowFirstRunBubble(bubble_type_); 1223 ShowFirstRunBubble(bubble_type_);
1224 } 1224 }
1225 1225
1226 #if defined(OS_WIN) 1226 #if defined(OS_WIN)
1227 bool LocationBarView::HasValidSuggestText() { 1227 bool LocationBarView::HasValidSuggestText() {
1228 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() && 1228 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
1229 !suggested_text_view_->GetText().empty(); 1229 !suggested_text_view_->GetText().empty();
1230 } 1230 }
1231 #endif 1231 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698