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

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

Issue 13974003: alternate ntp: fix content origin when overlay shrinks to shorter than top bars (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reduce 1 ContentsContainer::Layout Created 7 years, 8 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 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 2018 matching lines...) Expand 10 before | Expand all | Expand 10 after
2029 } 2029 }
2030 2030
2031 LoadAccelerators(); 2031 LoadAccelerators();
2032 2032
2033 infobar_container_ = new InfoBarContainerView(this, 2033 infobar_container_ = new InfoBarContainerView(this,
2034 browser()->search_model()); 2034 browser()->search_model());
2035 AddChildView(infobar_container_); 2035 AddChildView(infobar_container_);
2036 2036
2037 contents_container_ = new views::WebView(browser_->profile()); 2037 contents_container_ = new views::WebView(browser_->profile());
2038 contents_container_->set_id(VIEW_ID_TAB_CONTAINER); 2038 contents_container_->set_id(VIEW_ID_TAB_CONTAINER);
2039 contents_ = new ContentsContainer(contents_container_); 2039 contents_ = new ContentsContainer(contents_container_, this);
2040 2040
2041 overlay_controller_.reset( 2041 overlay_controller_.reset(
2042 new InstantOverlayControllerViews(browser(), contents_)); 2042 new InstantOverlayControllerViews(browser(), contents_));
2043 2043
2044 SkColor bg_color = GetWidget()->GetThemeProvider()-> 2044 SkColor bg_color = GetWidget()->GetThemeProvider()->
2045 GetColor(ThemeProperties::COLOR_TOOLBAR); 2045 GetColor(ThemeProperties::COLOR_TOOLBAR);
2046 2046
2047 devtools_container_ = new views::WebView(browser_->profile()); 2047 devtools_container_ = new views::WebView(browser_->profile());
2048 devtools_container_->set_id(VIEW_ID_DEV_TOOLS_DOCKED); 2048 devtools_container_->set_id(VIEW_ID_DEV_TOOLS_DOCKED);
2049 devtools_container_->SetVisible(false); 2049 devtools_container_->SetVisible(false);
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
2718 2718
2719 Browser* modal_browser = 2719 Browser* modal_browser =
2720 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); 2720 chrome::FindBrowserWithWebContents(active_dialog->web_contents());
2721 if (modal_browser && (browser_ != modal_browser)) { 2721 if (modal_browser && (browser_ != modal_browser)) {
2722 modal_browser->window()->FlashFrame(true); 2722 modal_browser->window()->FlashFrame(true);
2723 modal_browser->window()->Activate(); 2723 modal_browser->window()->Activate();
2724 } 2724 }
2725 2725
2726 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2726 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2727 } 2727 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698