| 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/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1919 AddChildView(infobar_container_); | 1919 AddChildView(infobar_container_); |
| 1920 | 1920 |
| 1921 contents_container_ = new views::WebView(browser_->profile()); | 1921 contents_container_ = new views::WebView(browser_->profile()); |
| 1922 contents_container_->set_id(VIEW_ID_TAB_CONTAINER); | 1922 contents_container_->set_id(VIEW_ID_TAB_CONTAINER); |
| 1923 contents_ = new ContentsContainer(contents_container_); | 1923 contents_ = new ContentsContainer(contents_container_); |
| 1924 | 1924 |
| 1925 views::View* omnibox_popup_view_parent = NULL; | 1925 views::View* omnibox_popup_view_parent = NULL; |
| 1926 // SearchViewController doesn't work on windows yet. | 1926 // SearchViewController doesn't work on windows yet. |
| 1927 #if defined(USE_AURA) | 1927 #if defined(USE_AURA) |
| 1928 if (chrome::search::IsInstantExtendedAPIEnabled(browser_->profile())) { | 1928 if (chrome::search::IsInstantExtendedAPIEnabled(browser_->profile())) { |
| 1929 search_view_controller_.reset(new SearchViewController(contents_)); | 1929 search_view_controller_.reset( |
| 1930 new SearchViewController(browser()->search_model(), |
| 1931 browser_->profile(), |
| 1932 contents_)); |
| 1930 omnibox_popup_view_parent = | 1933 omnibox_popup_view_parent = |
| 1931 search_view_controller_->omnibox_popup_view_parent(); | 1934 search_view_controller_->omnibox_popup_view_parent(); |
| 1932 } | 1935 } |
| 1933 #endif | 1936 #endif |
| 1934 | 1937 |
| 1935 toolbar_ = new ToolbarView(browser_.get()); | 1938 toolbar_ = new ToolbarView(browser_.get()); |
| 1936 AddChildView(toolbar_); | 1939 AddChildView(toolbar_); |
| 1937 toolbar_->Init(this, omnibox_popup_view_parent); | 1940 toolbar_->Init(this, omnibox_popup_view_parent); |
| 1938 | 1941 |
| 1939 #if defined(USE_AURA) | 1942 #if defined(USE_AURA) |
| (...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2565 bubble->Show(); | 2568 bubble->Show(); |
| 2566 } | 2569 } |
| 2567 | 2570 |
| 2568 void BrowserView::RestackLocationBarContainer() { | 2571 void BrowserView::RestackLocationBarContainer() { |
| 2569 #if defined(USE_AURA) | 2572 #if defined(USE_AURA) |
| 2570 if (search_view_controller_.get()) | 2573 if (search_view_controller_.get()) |
| 2571 search_view_controller_->StackAtTop(); | 2574 search_view_controller_->StackAtTop(); |
| 2572 #endif | 2575 #endif |
| 2573 toolbar_->location_bar_container()->StackAtTop(); | 2576 toolbar_->location_bar_container()->StackAtTop(); |
| 2574 } | 2577 } |
| OLD | NEW |