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

Side by Side Diff: chrome/browser/ui/views/default_search_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/default_search_view.h" 5 #include "chrome/browser/ui/views/default_search_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/search_engines/template_url.h" 11 #include "chrome/browser/search_engines/template_url.h"
12 #include "chrome/browser/search_engines/template_url_model.h" 12 #include "chrome/browser/search_engines/template_url_model.h"
13 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 13 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
14 #include "chrome/browser/tab_contents/tab_contents.h" 14 #include "chrome/browser/tab_contents/tab_contents.h"
15 #include "gfx/canvas.h"
16 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
17 #include "grit/locale_settings.h" 16 #include "grit/locale_settings.h"
18 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
19 #include "ui/base/message_box_flags.h" 18 #include "ui/base/message_box_flags.h"
20 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
21 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/gfx/canvas.h"
22 #include "views/controls/button/native_button.h" 22 #include "views/controls/button/native_button.h"
23 #include "views/controls/image_view.h" 23 #include "views/controls/image_view.h"
24 #include "views/controls/label.h" 24 #include "views/controls/label.h"
25 #include "views/layout/grid_layout.h" 25 #include "views/layout/grid_layout.h"
26 #include "views/layout/layout_constants.h" 26 #include "views/layout/layout_constants.h"
27 #include "views/window/dialog_client_view.h" 27 #include "views/window/dialog_client_view.h"
28 #include "views/window/window.h" 28 #include "views/window/window.h"
29 29
30 namespace { 30 namespace {
31 31
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 this, 292 this,
293 IDS_DEFAULT_SEARCH_PROMPT_CURRENT, 293 IDS_DEFAULT_SEARCH_PROMPT_CURRENT,
294 default_short_name); 294 default_short_name);
295 layout->AddView(default_provider_button_); 295 layout->AddView(default_provider_button_);
296 proposed_provider_button_ = CreateProviderChoiceButton( 296 proposed_provider_button_ = CreateProviderChoiceButton(
297 this, 297 this,
298 IDS_DEFAULT_SEARCH_PROMPT_PROPOSED, 298 IDS_DEFAULT_SEARCH_PROMPT_PROPOSED,
299 proposed_short_name); 299 proposed_short_name);
300 layout->AddView(proposed_provider_button_); 300 layout->AddView(proposed_provider_button_);
301 } 301 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/database_info_view.cc ('k') | chrome/browser/ui/views/detachable_toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698