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

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: addressed scott's comment 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view_layout.cc » ('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 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 2025 matching lines...) Expand 10 before | Expand all | Expand 10 after
2036 } 2036 }
2037 2037
2038 LoadAccelerators(); 2038 LoadAccelerators();
2039 2039
2040 infobar_container_ = new InfoBarContainerView(this, 2040 infobar_container_ = new InfoBarContainerView(this,
2041 browser()->search_model()); 2041 browser()->search_model());
2042 AddChildView(infobar_container_); 2042 AddChildView(infobar_container_);
2043 2043
2044 contents_container_ = new views::WebView(browser_->profile()); 2044 contents_container_ = new views::WebView(browser_->profile());
2045 contents_container_->set_id(VIEW_ID_TAB_CONTAINER); 2045 contents_container_->set_id(VIEW_ID_TAB_CONTAINER);
2046 contents_ = new ContentsContainer(contents_container_); 2046 contents_ = new ContentsContainer(contents_container_, this);
2047 2047
2048 overlay_controller_.reset( 2048 overlay_controller_.reset(
2049 new InstantOverlayControllerViews(browser(), contents_)); 2049 new InstantOverlayControllerViews(browser(), contents_));
2050 2050
2051 SkColor bg_color = GetWidget()->GetThemeProvider()-> 2051 SkColor bg_color = GetWidget()->GetThemeProvider()->
2052 GetColor(ThemeProperties::COLOR_TOOLBAR); 2052 GetColor(ThemeProperties::COLOR_TOOLBAR);
2053 2053
2054 devtools_container_ = new views::WebView(browser_->profile()); 2054 devtools_container_ = new views::WebView(browser_->profile());
2055 devtools_container_->set_id(VIEW_ID_DEV_TOOLS_DOCKED); 2055 devtools_container_->set_id(VIEW_ID_DEV_TOOLS_DOCKED);
2056 devtools_container_->SetVisible(false); 2056 devtools_container_->SetVisible(false);
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
2725 2725
2726 Browser* modal_browser = 2726 Browser* modal_browser =
2727 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); 2727 chrome::FindBrowserWithWebContents(active_dialog->web_contents());
2728 if (modal_browser && (browser_ != modal_browser)) { 2728 if (modal_browser && (browser_ != modal_browser)) {
2729 modal_browser->window()->FlashFrame(true); 2729 modal_browser->window()->FlashFrame(true);
2730 modal_browser->window()->Activate(); 2730 modal_browser->window()->Activate();
2731 } 2731 }
2732 2732
2733 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2733 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2734 } 2734 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698