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

Side by Side Diff: chrome/browser/cocoa/chrome_browser_window.mm

Issue 1576019: [Mac] Get theme providers from a window's delegate, not its window controller... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/cocoa/fullscreen_window.mm » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #import "chrome/browser/cocoa/chrome_browser_window.h" 5 #import "chrome/browser/cocoa/chrome_browser_window.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/browser_theme_provider.h" 8 #include "chrome/browser/browser_theme_provider.h"
9 #import "chrome/browser/cocoa/browser_frame_view.h" 9 #import "chrome/browser/cocoa/browser_frame_view.h"
10 #import "chrome/browser/cocoa/browser_window_controller.h" 10 #import "chrome/browser/cocoa/browser_window_controller.h"
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 // return the original (unconstrained) frame. 337 // return the original (unconstrained) frame.
338 id delegate = [self delegate]; 338 id delegate = [self delegate];
339 if ([delegate respondsToSelector:@selector(shouldConstrainFrameRect)] && 339 if ([delegate respondsToSelector:@selector(shouldConstrainFrameRect)] &&
340 ![delegate shouldConstrainFrameRect]) 340 ![delegate shouldConstrainFrameRect])
341 return frame; 341 return frame;
342 342
343 return [super constrainFrameRect:frame toScreen:screen]; 343 return [super constrainFrameRect:frame toScreen:screen];
344 } 344 }
345 345
346 - (ThemeProvider*)themeProvider { 346 - (ThemeProvider*)themeProvider {
347 return [[self windowController] themeProvider]; 347 return [[self delegate] themeProvider];
348 } 348 }
349 349
350 - (ThemedWindowStyle)themedWindowStyle { 350 - (ThemedWindowStyle)themedWindowStyle {
351 return [[self windowController] themedWindowStyle]; 351 return [[self delegate] themedWindowStyle];
352 } 352 }
353 353
354 - (NSPoint)themePatternPhase { 354 - (NSPoint)themePatternPhase {
355 return [[self windowController] themePatternPhase]; 355 return [[self delegate] themePatternPhase];
356 } 356 }
357 357
358 @end 358 @end
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/cocoa/fullscreen_window.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698