OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/search_view_controller.h" | 5 #include "chrome/browser/ui/views/search_view_controller.h" |
6 | 6 |
7 #include "chrome/browser/ui/search/search_model.h" | 7 #include "chrome/browser/ui/search/search_model.h" |
8 #include "chrome/browser/ui/search/search_tab_helper.h" | 8 #include "chrome/browser/ui/search/search_tab_helper.h" |
9 #include "chrome/browser/ui/search/search_types.h" | 9 #include "chrome/browser/ui/search/search_types.h" |
10 #include "chrome/browser/ui/search/search_ui.h" | 10 #include "chrome/browser/ui/search/search_ui.h" |
11 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 11 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
12 #include "chrome/browser/ui/views/frame/contents_container.h" | 12 #include "chrome/browser/ui/views/frame/contents_container.h" |
13 #include "chrome/browser/ui/views/location_bar/location_bar_container.h" | 13 #include "chrome/browser/ui/views/location_bar/location_bar_container.h" |
14 #include "chrome/browser/ui/webui/instant_ui.h" | 14 #include "chrome/browser/ui/webui/instant_ui.h" |
15 #include "chrome/common/url_constants.h" | 15 #include "chrome/common/url_constants.h" |
16 #include "grit/theme_resources.h" | 16 #include "grit/theme_resources.h" |
| 17 #include "ui/base/resource/resource_bundle.h" |
17 #include "ui/compositor/layer.h" | 18 #include "ui/compositor/layer.h" |
18 #include "ui/compositor/scoped_layer_animation_settings.h" | 19 #include "ui/compositor/scoped_layer_animation_settings.h" |
19 #include "ui/base/resource/resource_bundle.h" | |
20 #include "ui/gfx/canvas.h" | 20 #include "ui/gfx/canvas.h" |
21 #include "ui/views/controls/webview/webview.h" | 21 #include "ui/views/controls/webview/webview.h" |
22 #include "ui/views/layout/fill_layout.h" | 22 #include "ui/views/layout/fill_layout.h" |
23 #include "ui/views/layout/layout_manager.h" | 23 #include "ui/views/layout/layout_manager.h" |
24 | 24 |
25 #if defined(USE_AURA) | 25 #if defined(USE_AURA) |
26 #include "ui/aura/window.h" | 26 #include "ui/aura/window.h" |
27 #endif | 27 #endif |
28 | 28 |
29 namespace { | 29 namespace { |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 } | 482 } |
483 } | 483 } |
484 | 484 |
485 chrome::search::SearchModel* SearchViewController::search_model() { | 485 chrome::search::SearchModel* SearchViewController::search_model() { |
486 return tab_contents_ ? tab_contents_->search_tab_helper()->model() : NULL; | 486 return tab_contents_ ? tab_contents_->search_tab_helper()->model() : NULL; |
487 } | 487 } |
488 | 488 |
489 content::WebContents* SearchViewController::web_contents() { | 489 content::WebContents* SearchViewController::web_contents() { |
490 return tab_contents_ ? tab_contents_->web_contents() : NULL; | 490 return tab_contents_ ? tab_contents_->web_contents() : NULL; |
491 } | 491 } |
OLD | NEW |