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

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

Issue 5747001: Add the virtual keyboard to BrowserFrameChromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 10 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
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.h ('k') | chrome/chrome_browser.gypi » ('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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/views/frame/opaque_browser_frame_view.h" 5 #include "chrome/browser/views/frame/opaque_browser_frame_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "app/theme_provider.h" 9 #include "app/theme_provider.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 window_icon_->set_is_light(true); 170 window_icon_->set_is_light(true);
171 AddChildView(window_icon_); 171 AddChildView(window_icon_);
172 window_icon_->Update(); 172 window_icon_->Update();
173 } 173 }
174 } 174 }
175 175
176 OpaqueBrowserFrameView::~OpaqueBrowserFrameView() { 176 OpaqueBrowserFrameView::~OpaqueBrowserFrameView() {
177 } 177 }
178 178
179 /////////////////////////////////////////////////////////////////////////////// 179 ///////////////////////////////////////////////////////////////////////////////
180 // OpaqueBrowserFrameView, protected:
181
182 int OpaqueBrowserFrameView::GetReservedHeight() const {
183 return 0;
184 }
185
186 ///////////////////////////////////////////////////////////////////////////////
180 // OpaqueBrowserFrameView, BrowserNonClientFrameView implementation: 187 // OpaqueBrowserFrameView, BrowserNonClientFrameView implementation:
181 188
182 gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStrip( 189 gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStrip(
183 BaseTabStrip* tabstrip) const { 190 BaseTabStrip* tabstrip) const {
184 if (browser_view_->UseVerticalTabs()) { 191 if (browser_view_->UseVerticalTabs()) {
185 gfx::Size ps = tabstrip->GetPreferredSize(); 192 gfx::Size ps = tabstrip->GetPreferredSize();
186 return gfx::Rect(NonClientBorderThickness(), 193 return gfx::Rect(NonClientBorderThickness(),
187 NonClientTopBorderHeight(false, false), ps.width(), 194 NonClientTopBorderHeight(false, false), ps.width(),
188 browser_view_->height()); 195 browser_view_->height());
189 } 196 }
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 otr_y, otr_avatar_icon.width(), 1048 otr_y, otr_avatar_icon.width(),
1042 browser_view_->ShouldShowOffTheRecordAvatar() ? (otr_bottom - otr_y) : 0); 1049 browser_view_->ShouldShowOffTheRecordAvatar() ? (otr_bottom - otr_y) : 0);
1043 } 1050 }
1044 1051
1045 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width, 1052 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,
1046 int height) const { 1053 int height) const {
1047 int top_height = NonClientTopBorderHeight(false, false); 1054 int top_height = NonClientTopBorderHeight(false, false);
1048 int border_thickness = NonClientBorderThickness(); 1055 int border_thickness = NonClientBorderThickness();
1049 return gfx::Rect(border_thickness, top_height, 1056 return gfx::Rect(border_thickness, top_height,
1050 std::max(0, width - (2 * border_thickness)), 1057 std::max(0, width - (2 * border_thickness)),
1051 std::max(0, height - top_height - border_thickness)); 1058 std::max(0, height - GetReservedHeight() -
1059 top_height - border_thickness));
1052 } 1060 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698