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

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

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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_frame.h" 5 #include "chrome/browser/ui/views/frame/browser_frame.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/leak_annotations.h" 9 #include "base/debug/leak_annotations.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 return root_view_; 208 return root_view_;
209 } 209 }
210 210
211 views::NonClientFrameView* BrowserFrame::CreateNonClientFrameView() { 211 views::NonClientFrameView* BrowserFrame::CreateNonClientFrameView() {
212 browser_frame_view_ = 212 browser_frame_view_ =
213 chrome::CreateBrowserNonClientFrameView(this, browser_view_); 213 chrome::CreateBrowserNonClientFrameView(this, browser_view_);
214 return browser_frame_view_; 214 return browser_frame_view_;
215 } 215 }
216 216
217 bool BrowserFrame::GetAccelerator(int command_id, 217 bool BrowserFrame::GetAccelerator(int command_id,
218 ui::Accelerator* accelerator) { 218 ui::Accelerator* accelerator) const {
219 return browser_view_->GetAccelerator(command_id, accelerator); 219 return browser_view_->GetAccelerator(command_id, accelerator);
220 } 220 }
221 221
222 ui::ThemeProvider* BrowserFrame::GetThemeProvider() const { 222 ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
223 return theme_provider_; 223 return theme_provider_;
224 } 224 }
225 225
226 void BrowserFrame::SchedulePaintInRect(const gfx::Rect& rect) { 226 void BrowserFrame::SchedulePaintInRect(const gfx::Rect& rect) {
227 views::Widget::SchedulePaintInRect(rect); 227 views::Widget::SchedulePaintInRect(rect);
228 228
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { 309 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() {
310 return !IsMaximized(); 310 return !IsMaximized();
311 } 311 }
312 312
313 void BrowserFrame::OnUseCustomChromeFrameChanged() { 313 void BrowserFrame::OnUseCustomChromeFrameChanged() {
314 // Tell the window manager to add or remove system borders. 314 // Tell the window manager to add or remove system borders.
315 set_frame_type(UseCustomFrame() ? Widget::FRAME_TYPE_FORCE_CUSTOM 315 set_frame_type(UseCustomFrame() ? Widget::FRAME_TYPE_FORCE_CUSTOM
316 : Widget::FRAME_TYPE_FORCE_NATIVE); 316 : Widget::FRAME_TYPE_FORCE_NATIVE);
317 FrameTypeChanged(); 317 FrameTypeChanged();
318 } 318 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame.h ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698