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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10854173: Use a placeholder logo image/label in SearchViewController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and rebase. Created 8 years, 4 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
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/ui/views/search_view_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1917 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 infobar_container_ = new InfoBarContainerView(this); 1928 infobar_container_ = new InfoBarContainerView(this);
1929 AddChildView(infobar_container_); 1929 AddChildView(infobar_container_);
1930 1930
1931 contents_container_ = new views::WebView(browser_->profile()); 1931 contents_container_ = new views::WebView(browser_->profile());
1932 contents_container_->set_id(VIEW_ID_TAB_CONTAINER); 1932 contents_container_->set_id(VIEW_ID_TAB_CONTAINER);
1933 contents_ = new ContentsContainer(contents_container_); 1933 contents_ = new ContentsContainer(contents_container_);
1934 1934
1935 views::View* omnibox_popup_view_parent = NULL; 1935 views::View* omnibox_popup_view_parent = NULL;
1936 // SearchViewController doesn't work on windows yet. 1936 // SearchViewController doesn't work on windows yet.
1937 #if defined(USE_AURA) 1937 #if defined(USE_AURA)
1938 if (chrome::search::IsInstantExtendedAPIEnabled(browser_->profile())) { 1938 Profile* profile = browser_->profile();
1939 search_view_controller_.reset(new SearchViewController(contents_)); 1939 if (chrome::search::IsInstantExtendedAPIEnabled(profile)) {
1940 search_view_controller_.reset(new SearchViewController(profile, contents_));
1940 omnibox_popup_view_parent = 1941 omnibox_popup_view_parent =
1941 search_view_controller_->omnibox_popup_view_parent(); 1942 search_view_controller_->omnibox_popup_view_parent();
1942 } 1943 }
1943 #endif 1944 #endif
1944 1945
1945 toolbar_ = new ToolbarView(browser_.get()); 1946 toolbar_ = new ToolbarView(browser_.get());
1946 AddChildView(toolbar_); 1947 AddChildView(toolbar_);
1947 toolbar_->Init(this, omnibox_popup_view_parent); 1948 toolbar_->Init(this, omnibox_popup_view_parent);
1948 1949
1949 #if defined(USE_AURA) 1950 #if defined(USE_AURA)
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
2606 2607
2607 Browser* modal_browser = 2608 Browser* modal_browser =
2608 browser::FindBrowserWithWebContents(active_dialog->web_contents()); 2609 browser::FindBrowserWithWebContents(active_dialog->web_contents());
2609 if (modal_browser && (browser_ != modal_browser)) { 2610 if (modal_browser && (browser_ != modal_browser)) {
2610 modal_browser->window()->FlashFrame(true); 2611 modal_browser->window()->FlashFrame(true);
2611 modal_browser->window()->Activate(); 2612 modal_browser->window()->Activate();
2612 } 2613 }
2613 2614
2614 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2615 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2615 } 2616 }
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/ui/views/search_view_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698