OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/chromeos/frame/browser_frame_view_chromeos.h" | 5 #include "chrome/browser/chromeos/frame/browser_frame_view_chromeos.h" |
6 | 6 |
7 #include "chrome/browser/themes/theme_service_factory.h" | 7 #include "chrome/browser/themes/theme_service_factory.h" |
8 #include "chrome/browser/themes/theme_service.h" | 8 #include "chrome/browser/themes/theme_service.h" |
9 #include "chrome/browser/ui/views/frame/browser_view.h" | 9 #include "chrome/browser/ui/views/frame/browser_view.h" |
10 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
67 return NonClientTopBorderHeight(restored) + kTopPad; | 67 return NonClientTopBorderHeight(restored) + kTopPad; |
68 } | 68 } |
69 | 69 |
70 void BrowserFrameViewChromeos::ModifyMaximizedFramePainting( | 70 void BrowserFrameViewChromeos::ModifyMaximizedFramePainting( |
71 int* top_offset, SkBitmap** left_corner, SkBitmap** right_corner) { | 71 int* top_offset, SkBitmap** left_corner, SkBitmap** right_corner) { |
72 *top_offset = kThemeOffset; | 72 *top_offset = kThemeOffset; |
73 ui::ThemeProvider* tp = GetThemeProvider(); | 73 ui::ThemeProvider* tp = GetThemeProvider(); |
74 if (!ThemeServiceFactory::GetForProfile( | 74 if (!ThemeServiceFactory::GetForProfile( |
75 browser_view()->browser()->profile())->UsingDefaultTheme()) | 75 browser_view()->browser()->profile())->UsingDefaultTheme()) |
76 return; | 76 return; |
77 if (browser_view()->IsOffTheRecord()) { | 77 if (!browser_view()->IsOffTheRecord()) { |
whywhat
2011/12/08 17:21:01
Is it some debug change? Seems like it should rema
Ivan Korotkov
2011/12/09 09:38:22
Ooops. Thanks for the catch.
| |
78 *left_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO_LEFT); | 78 *left_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO_LEFT); |
79 *right_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO_RIGHT); | 79 *right_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO_RIGHT); |
80 } else { | 80 } else { |
81 *left_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_LEFT); | 81 *left_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_LEFT); |
82 *right_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_RIGHT); | 82 *right_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_RIGHT); |
83 } | 83 } |
84 } | 84 } |
85 | 85 |
86 } // namespace chromeos | 86 } // namespace chromeos |
OLD | NEW |