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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #include "app/resource_bundle.h"
13 #include "base/command_line.h" 12 #include "base/command_line.h"
14 #include "base/stl_util-inl.h" 13 #include "base/stl_util-inl.h"
15 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
16 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
17 #include "chrome/browser/alternate_nav_url_fetcher.h" 16 #include "chrome/browser/alternate_nav_url_fetcher.h"
18 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" 17 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
19 #include "chrome/browser/defaults.h" 18 #include "chrome/browser/defaults.h"
20 #include "chrome/browser/extensions/extension_browser_event_router.h" 19 #include "chrome/browser/extensions/extension_browser_event_router.h"
21 #include "chrome/browser/extensions/extension_service.h" 20 #include "chrome/browser/extensions/extension_service.h"
22 #include "chrome/browser/instant/instant_controller.h" 21 #include "chrome/browser/instant/instant_controller.h"
(...skipping 13 matching lines...) Expand all
36 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" 35 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
37 #include "chrome/browser/ui/views/location_bar/star_view.h" 36 #include "chrome/browser/ui/views/location_bar/star_view.h"
38 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
39 #include "chrome/common/notification_service.h" 38 #include "chrome/common/notification_service.h"
40 #include "gfx/canvas_skia.h" 39 #include "gfx/canvas_skia.h"
41 #include "gfx/color_utils.h" 40 #include "gfx/color_utils.h"
42 #include "gfx/skia_util.h" 41 #include "gfx/skia_util.h"
43 #include "grit/generated_resources.h" 42 #include "grit/generated_resources.h"
44 #include "grit/theme_resources.h" 43 #include "grit/theme_resources.h"
45 #include "ui/base/dragdrop/drag_drop_types.h" 44 #include "ui/base/dragdrop/drag_drop_types.h"
45 #include "ui/base/resource/resource_bundle.h"
46 #include "ui/base/theme_provider.h" 46 #include "ui/base/theme_provider.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;
(...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1256 template_url_model_ = NULL; 1256 template_url_model_ = NULL;
1257 ShowFirstRunBubble(bubble_type_); 1257 ShowFirstRunBubble(bubble_type_);
1258 } 1258 }
1259 1259
1260 #if defined(OS_WIN) 1260 #if defined(OS_WIN)
1261 bool LocationBarView::HasValidSuggestText() { 1261 bool LocationBarView::HasValidSuggestText() {
1262 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() && 1262 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
1263 !suggested_text_view_->GetText().empty(); 1263 !suggested_text_view_->GetText().empty();
1264 } 1264 }
1265 #endif 1265 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/keyword_hint_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