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

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

Issue 8687031: views: Move the remaining files to ui/views/controls/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_layout.h" 5 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
6 6
7 #include "chrome/browser/sidebar/sidebar_manager.h" 7 #include "chrome/browser/sidebar/sidebar_manager.h"
8 #include "chrome/browser/ui/find_bar/find_bar.h" 8 #include "chrome/browser/ui/find_bar/find_bar.h"
9 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 9 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
10 #include "chrome/browser/ui/view_ids.h" 10 #include "chrome/browser/ui/view_ids.h"
11 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 11 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
12 #include "chrome/browser/ui/views/frame/browser_frame.h" 12 #include "chrome/browser/ui/views/frame/browser_frame.h"
13 #include "chrome/browser/ui/views/frame/browser_view.h" 13 #include "chrome/browser/ui/views/frame/browser_view.h"
14 #include "chrome/browser/ui/views/frame/contents_container.h" 14 #include "chrome/browser/ui/views/frame/contents_container.h"
15 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" 15 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
16 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" 16 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
17 #include "chrome/browser/ui/views/tabs/abstract_tab_strip_view.h" 17 #include "chrome/browser/ui/views/tabs/abstract_tab_strip_view.h"
18 #include "chrome/browser/ui/views/toolbar_view.h" 18 #include "chrome/browser/ui/views/toolbar_view.h"
19 #include "ui/base/hit_test.h" 19 #include "ui/base/hit_test.h"
20 #include "ui/gfx/point.h" 20 #include "ui/gfx/point.h"
21 #include "ui/gfx/scrollbar_size.h" 21 #include "ui/gfx/scrollbar_size.h"
22 #include "ui/gfx/size.h" 22 #include "ui/gfx/size.h"
23 #include "views/controls/single_split_view.h" 23 #include "ui/views/controls/single_split_view.h"
24 24
25 #if !defined(OS_CHROMEOS) || defined(USE_AURA) 25 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
26 #include "chrome/browser/ui/views/download/download_shelf_view.h" 26 #include "chrome/browser/ui/views/download/download_shelf_view.h"
27 #endif 27 #endif
28 28
29 namespace { 29 namespace {
30 30
31 // The visible height of the shadow above the tabs. Clicks in this area are 31 // The visible height of the shadow above the tabs. Clicks in this area are
32 // treated as clicks to the frame, rather than clicks to the tab. 32 // treated as clicks to the frame, rather than clicks to the tab.
33 const int kTabShadowSize = 2; 33 const int kTabShadowSize = 2;
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 } 532 }
533 #endif 533 #endif
534 return bottom; 534 return bottom;
535 } 535 }
536 536
537 bool BrowserViewLayout::InfobarVisible() const { 537 bool BrowserViewLayout::InfobarVisible() const {
538 // NOTE: Can't check if the size IsEmpty() since it's always 0-width. 538 // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
539 return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) && 539 return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
540 (infobar_container_->GetPreferredSize().height() != 0); 540 (infobar_container_->GetPreferredSize().height() != 0);
541 } 541 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698