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

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: Browser test fixes Created 8 years, 2 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 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after
1394 #endif 1394 #endif
1395 #else 1395 #else
1396 return NEW_POPUP; 1396 return NEW_POPUP;
1397 #endif 1397 #endif
1398 } 1398 }
1399 1399
1400 FindBar* BrowserView::CreateFindBar() { 1400 FindBar* BrowserView::CreateFindBar() {
1401 return chrome::CreateFindBar(this); 1401 return chrome::CreateFindBar(this);
1402 } 1402 }
1403 1403
1404 int BrowserView::GetConstrainedWindowTopY() {
1405 return GetBrowserViewLayout()->GetConstrainedWindowTopY();
1406 }
1407
1404 /////////////////////////////////////////////////////////////////////////////// 1408 ///////////////////////////////////////////////////////////////////////////////
1405 // BrowserView, BrowserWindowTesting implementation: 1409 // BrowserView, BrowserWindowTesting implementation:
1406 1410
1407 BookmarkBarView* BrowserView::GetBookmarkBarView() const { 1411 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
1408 return bookmark_bar_view_.get(); 1412 return bookmark_bar_view_.get();
1409 } 1413 }
1410 1414
1411 LocationBarView* BrowserView::GetLocationBarView() const { 1415 LocationBarView* BrowserView::GetLocationBarView() const {
1412 return toolbar_ ? toolbar_->location_bar() : NULL; 1416 return toolbar_ ? toolbar_->location_bar() : NULL;
1413 } 1417 }
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after
2642 2646
2643 Browser* modal_browser = 2647 Browser* modal_browser =
2644 browser::FindBrowserWithWebContents(active_dialog->web_contents()); 2648 browser::FindBrowserWithWebContents(active_dialog->web_contents());
2645 if (modal_browser && (browser_ != modal_browser)) { 2649 if (modal_browser && (browser_ != modal_browser)) {
2646 modal_browser->window()->FlashFrame(true); 2650 modal_browser->window()->FlashFrame(true);
2647 modal_browser->window()->Activate(); 2651 modal_browser->window()->Activate();
2648 } 2652 }
2649 2653
2650 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2654 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2651 } 2655 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698