OLD | NEW |
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 <utility> | 7 #include <utility> |
8 | 8 |
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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 views::Widget::InitParams params = native_browser_frame_->GetWidgetParams(); | 78 views::Widget::InitParams params = native_browser_frame_->GetWidgetParams(); |
79 params.delegate = browser_view_; | 79 params.delegate = browser_view_; |
80 if (browser_view_->browser()->is_type_tabbed()) { | 80 if (browser_view_->browser()->is_type_tabbed()) { |
81 // Typed panel/popup can only return a size once the widget has been | 81 // Typed panel/popup can only return a size once the widget has been |
82 // created. | 82 // created. |
83 chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(), | 83 chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(), |
84 ¶ms.bounds, | 84 ¶ms.bounds, |
85 ¶ms.show_state); | 85 ¶ms.show_state); |
86 } | 86 } |
87 | 87 |
88 if (browser_view_->browser()->profile()->IsOffTheRecord()) { | 88 if (browser_view_->browser()->profile()->GetProfileType() == |
| 89 Profile::INCOGNITO_PROFILE) { |
89 #if defined(OS_WIN) | 90 #if defined(OS_WIN) |
90 params.native_theme = ui::NativeThemeDarkWin::instance(); | 91 params.native_theme = ui::NativeThemeDarkWin::instance(); |
91 #elif defined(OS_CHROMEOS) | 92 #elif defined(OS_CHROMEOS) |
92 params.native_theme = ui::NativeThemeDarkAura::instance(); | 93 params.native_theme = ui::NativeThemeDarkAura::instance(); |
93 #endif | 94 #endif |
94 } | 95 } |
95 | 96 |
96 Init(params); | 97 Init(params); |
97 | 98 |
98 if (!native_browser_frame_->UsesNativeSystemMenu()) { | 99 if (!native_browser_frame_->UsesNativeSystemMenu()) { |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 | 257 |
257 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { | 258 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { |
258 return browser_frame_view_->avatar_button(); | 259 return browser_frame_view_->avatar_button(); |
259 } | 260 } |
260 | 261 |
261 #if defined(FRAME_AVATAR_BUTTON) | 262 #if defined(FRAME_AVATAR_BUTTON) |
262 views::View* BrowserFrame::GetNewAvatarMenuButton() { | 263 views::View* BrowserFrame::GetNewAvatarMenuButton() { |
263 return browser_frame_view_->new_avatar_button(); | 264 return browser_frame_view_->new_avatar_button(); |
264 } | 265 } |
265 #endif | 266 #endif |
OLD | NEW |