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

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

Issue 20011: Improved OTR avatar and popup window rendering. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "base/command_line.h" 5 #include "base/command_line.h"
6 6
7 #include "chrome/browser/views/frame/browser_view.h" 7 #include "chrome/browser/views/frame/browser_view.h"
8 8
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after
1087 return tabstrip_bounds.bottom(); 1087 return tabstrip_bounds.bottom();
1088 } 1088 }
1089 return 0; 1089 return 0;
1090 } 1090 }
1091 1091
1092 int BrowserView::LayoutToolbar(int top) { 1092 int BrowserView::LayoutToolbar(int top) {
1093 if (IsToolbarVisible()) { 1093 if (IsToolbarVisible()) {
1094 gfx::Size ps = toolbar_->GetPreferredSize(); 1094 gfx::Size ps = toolbar_->GetPreferredSize();
1095 int toolbar_y = 1095 int toolbar_y =
1096 top - (IsTabStripVisible() ? kToolbarTabStripVerticalOverlap : 0); 1096 top - (IsTabStripVisible() ? kToolbarTabStripVerticalOverlap : 0);
1097 // With detached popup windows with the aero glass frame, we need to offset
1098 // by a pixel to make things look good.
1099 if (!IsTabStripVisible() && win_util::ShouldUseVistaFrame())
1100 ps.Enlarge(0, -1);
1101 int browser_view_width = width(); 1097 int browser_view_width = width();
1102 #ifdef CHROME_PERSONALIZATION 1098 #ifdef CHROME_PERSONALIZATION
1103 if (IsPersonalizationEnabled()) 1099 if (IsPersonalizationEnabled())
1104 Personalization::AdjustBrowserView(personalization_, &browser_view_width); 1100 Personalization::AdjustBrowserView(personalization_, &browser_view_width);
1105 #endif 1101 #endif
1106 toolbar_->SetBounds(0, toolbar_y, browser_view_width, ps.height()); 1102 toolbar_->SetBounds(0, toolbar_y, browser_view_width, ps.height());
1107 return toolbar_y + ps.height(); 1103 return toolbar_y + ps.height();
1108 } 1104 }
1109 toolbar_->SetVisible(false); 1105 toolbar_->SetVisible(false);
1110 return top; 1106 return top;
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
1404 1400
1405 // static 1401 // static
1406 void BrowserView::InitClass() { 1402 void BrowserView::InitClass() {
1407 static bool initialized = false; 1403 static bool initialized = false;
1408 if (!initialized) { 1404 if (!initialized) {
1409 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 1405 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
1410 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); 1406 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
1411 initialized = true; 1407 initialized = true;
1412 } 1408 }
1413 } 1409 }
OLDNEW
« no previous file with comments | « chrome/browser/views/frame/aero_glass_non_client_view.cc ('k') | chrome/browser/views/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698