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 "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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 | 181 |
182 void BrowserFrame::UpdateThrobber(bool running) { | 182 void BrowserFrame::UpdateThrobber(bool running) { |
183 browser_frame_view_->UpdateThrobber(running); | 183 browser_frame_view_->UpdateThrobber(running); |
184 } | 184 } |
185 | 185 |
186 views::View* BrowserFrame::GetFrameView() const { | 186 views::View* BrowserFrame::GetFrameView() const { |
187 return browser_frame_view_; | 187 return browser_frame_view_; |
188 } | 188 } |
189 | 189 |
190 bool BrowserFrame::UseCustomFrame() const { | 190 bool BrowserFrame::UseCustomFrame() const { |
191 return use_custom_frame_pref_.GetValue(); | 191 return use_custom_frame_pref_.GetValue() && |
| 192 browser_view_->IsBrowserTypeNormal(); |
192 } | 193 } |
193 | 194 |
194 bool BrowserFrame::ShouldSaveWindowPlacement() const { | 195 bool BrowserFrame::ShouldSaveWindowPlacement() const { |
195 return native_browser_frame_->ShouldSaveWindowPlacement(); | 196 return native_browser_frame_->ShouldSaveWindowPlacement(); |
196 } | 197 } |
197 | 198 |
198 void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds, | 199 void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds, |
199 ui::WindowShowState* show_state) const { | 200 ui::WindowShowState* show_state) const { |
200 return native_browser_frame_->GetWindowPlacement(bounds, show_state); | 201 return native_browser_frame_->GetWindowPlacement(bounds, show_state); |
201 } | 202 } |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { | 310 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { |
310 return !IsMaximized(); | 311 return !IsMaximized(); |
311 } | 312 } |
312 | 313 |
313 void BrowserFrame::OnUseCustomChromeFrameChanged() { | 314 void BrowserFrame::OnUseCustomChromeFrameChanged() { |
314 // Tell the window manager to add or remove system borders. | 315 // Tell the window manager to add or remove system borders. |
315 set_frame_type(UseCustomFrame() ? Widget::FRAME_TYPE_FORCE_CUSTOM | 316 set_frame_type(UseCustomFrame() ? Widget::FRAME_TYPE_FORCE_CUSTOM |
316 : Widget::FRAME_TYPE_FORCE_NATIVE); | 317 : Widget::FRAME_TYPE_FORCE_NATIVE); |
317 FrameTypeChanged(); | 318 FrameTypeChanged(); |
318 } | 319 } |
OLD | NEW |