OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 1932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1943 LoadAccelerators(); | 1943 LoadAccelerators(); |
1944 | 1944 |
1945 // TabStrip takes ownership of the controller. | 1945 // TabStrip takes ownership of the controller. |
1946 BrowserTabStripController* tabstrip_controller = | 1946 BrowserTabStripController* tabstrip_controller = |
1947 new BrowserTabStripController(browser_.get(), | 1947 new BrowserTabStripController(browser_.get(), |
1948 browser_->tab_strip_model()); | 1948 browser_->tab_strip_model()); |
1949 tabstrip_ = new TabStrip(tabstrip_controller); | 1949 tabstrip_ = new TabStrip(tabstrip_controller); |
1950 AddChildViewAt(tabstrip_, kTabstripIndex); | 1950 AddChildViewAt(tabstrip_, kTabstripIndex); |
1951 tabstrip_controller->InitFromModel(tabstrip_); | 1951 tabstrip_controller->InitFromModel(tabstrip_); |
1952 | 1952 |
1953 infobar_container_ = new InfoBarContainerView(this, | 1953 infobar_container_ = new InfoBarContainerView( |
1954 browser()->search_model()); | 1954 this, browser()->search_model(), |
| 1955 browser_->instant_controller() ? |
| 1956 browser_->instant_controller()->instant()->model() : NULL); |
1955 AddChildViewAt(infobar_container_, kInfoBarIndex); | 1957 AddChildViewAt(infobar_container_, kInfoBarIndex); |
1956 | 1958 |
1957 contents_container_ = new views::WebView(browser_->profile()); | 1959 contents_container_ = new views::WebView(browser_->profile()); |
1958 contents_container_->set_id(VIEW_ID_TAB_CONTAINER); | 1960 contents_container_->set_id(VIEW_ID_TAB_CONTAINER); |
1959 contents_ = new ContentsContainer(contents_container_); | 1961 contents_ = new ContentsContainer(contents_container_); |
1960 | 1962 |
1961 toolbar_ = new ToolbarView(browser_.get()); | 1963 toolbar_ = new ToolbarView(browser_.get()); |
1962 AddChildViewAt(toolbar_, kToolbarIndex); | 1964 AddChildViewAt(toolbar_, kToolbarIndex); |
1963 toolbar_->Init(); | 1965 toolbar_->Init(); |
1964 | 1966 |
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2603 | 2605 |
2604 Browser* modal_browser = | 2606 Browser* modal_browser = |
2605 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); | 2607 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); |
2606 if (modal_browser && (browser_ != modal_browser)) { | 2608 if (modal_browser && (browser_ != modal_browser)) { |
2607 modal_browser->window()->FlashFrame(true); | 2609 modal_browser->window()->FlashFrame(true); |
2608 modal_browser->window()->Activate(); | 2610 modal_browser->window()->Activate(); |
2609 } | 2611 } |
2610 | 2612 |
2611 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2613 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
2612 } | 2614 } |
OLD | NEW |