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

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

Issue 10933085: Update ConstrainedWindowViews appearance according to mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review updates Created 8 years, 3 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 (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 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after
1395 #endif 1395 #endif
1396 #else 1396 #else
1397 return NEW_POPUP; 1397 return NEW_POPUP;
1398 #endif 1398 #endif
1399 } 1399 }
1400 1400
1401 FindBar* BrowserView::CreateFindBar() { 1401 FindBar* BrowserView::CreateFindBar() {
1402 return chrome::CreateFindBar(this); 1402 return chrome::CreateFindBar(this);
1403 } 1403 }
1404 1404
1405 int BrowserView::GetConstrainedWindowTopY() {
1406 return GetBrowserViewLayout()->GetConstrainedWindowTopY();
1407 }
1408
1405 /////////////////////////////////////////////////////////////////////////////// 1409 ///////////////////////////////////////////////////////////////////////////////
1406 // BrowserView, BrowserWindowTesting implementation: 1410 // BrowserView, BrowserWindowTesting implementation:
1407 1411
1408 BookmarkBarView* BrowserView::GetBookmarkBarView() const { 1412 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
1409 return bookmark_bar_view_.get(); 1413 return bookmark_bar_view_.get();
1410 } 1414 }
1411 1415
1412 LocationBarView* BrowserView::GetLocationBarView() const { 1416 LocationBarView* BrowserView::GetLocationBarView() const {
1413 return toolbar_ ? toolbar_->location_bar() : NULL; 1417 return toolbar_ ? toolbar_->location_bar() : NULL;
1414 } 1418 }
(...skipping 1224 matching lines...) Expand 10 before | Expand all | Expand 10 after
2639 2643
2640 Browser* modal_browser = 2644 Browser* modal_browser =
2641 browser::FindBrowserWithWebContents(active_dialog->web_contents()); 2645 browser::FindBrowserWithWebContents(active_dialog->web_contents());
2642 if (modal_browser && (browser_ != modal_browser)) { 2646 if (modal_browser && (browser_ != modal_browser)) {
2643 modal_browser->window()->FlashFrame(true); 2647 modal_browser->window()->FlashFrame(true);
2644 modal_browser->window()->Activate(); 2648 modal_browser->window()->Activate();
2645 } 2649 }
2646 2650
2647 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2651 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2648 } 2652 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698