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

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

Issue 5711001: Add a new GetInstance() method for remaining files with singleton classes under chrome/browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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
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/browser_frame_win.h" 5 #include "chrome/browser/views/frame/browser_frame_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 ThemeProvider* BrowserFrameWin::GetThemeProvider() const { 234 ThemeProvider* BrowserFrameWin::GetThemeProvider() const {
235 return profile_->GetThemeProvider(); 235 return profile_->GetThemeProvider();
236 } 236 }
237 237
238 ThemeProvider* BrowserFrameWin::GetDefaultThemeProvider() const { 238 ThemeProvider* BrowserFrameWin::GetDefaultThemeProvider() const {
239 return profile_->GetThemeProvider(); 239 return profile_->GetThemeProvider();
240 } 240 }
241 241
242 void BrowserFrameWin::OnScreenReaderDetected() { 242 void BrowserFrameWin::OnScreenReaderDetected() {
243 Singleton<BrowserAccessibilityState>()->OnScreenReaderDetected(); 243 BrowserAccessibilityState::GetInstance()->OnScreenReaderDetected();
244 WindowWin::OnScreenReaderDetected(); 244 WindowWin::OnScreenReaderDetected();
245 } 245 }
246 246
247 /////////////////////////////////////////////////////////////////////////////// 247 ///////////////////////////////////////////////////////////////////////////////
248 // BrowserFrame, views::CustomFrameWindow overrides: 248 // BrowserFrame, views::CustomFrameWindow overrides:
249 249
250 int BrowserFrameWin::GetShowState() const { 250 int BrowserFrameWin::GetShowState() const {
251 return browser_view_->GetShowState(); 251 return browser_view_->GetShowState();
252 } 252 }
253 253
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 gfx::Rect tabstrip_bounds( 310 gfx::Rect tabstrip_bounds(
311 GetBoundsForTabStrip(browser_view_->tabstrip())); 311 GetBoundsForTabStrip(browser_view_->tabstrip()));
312 margins.cyTopHeight = (browser_view_->UseVerticalTabs() ? 312 margins.cyTopHeight = (browser_view_->UseVerticalTabs() ?
313 tabstrip_bounds.y() : tabstrip_bounds.bottom()) + kDWMFrameTopOffset; 313 tabstrip_bounds.y() : tabstrip_bounds.bottom()) + kDWMFrameTopOffset;
314 } 314 }
315 } else { 315 } else {
316 // For popup and app windows we want to use the default margins. 316 // For popup and app windows we want to use the default margins.
317 } 317 }
318 DwmExtendFrameIntoClientArea(GetNativeView(), &margins); 318 DwmExtendFrameIntoClientArea(GetNativeView(), &margins);
319 } 319 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698