| 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 26 matching lines...) Expand all Loading... |
| 37 | 37 |
| 38 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 38 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 39 #include "chrome/browser/shell_integration_linux.h" | 39 #include "chrome/browser/shell_integration_linux.h" |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 #if defined(USE_ASH) | 42 #if defined(USE_ASH) |
| 43 #include "chrome/browser/ui/ash/ash_init.h" | 43 #include "chrome/browser/ui/ash/ash_init.h" |
| 44 #endif | 44 #endif |
| 45 | 45 |
| 46 #if defined(OS_CHROMEOS) | 46 #if defined(OS_CHROMEOS) |
| 47 #include "ash/session_state_delegate.h" | 47 #include "ash/session/session_state_delegate.h" |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 #if defined(USE_X11) | 50 #if defined(USE_X11) |
| 51 #include "chrome/browser/ui/views/frame/browser_command_handler_x11.h" | 51 #include "chrome/browser/ui/views/frame/browser_command_handler_x11.h" |
| 52 #endif | 52 #endif |
| 53 | 53 |
| 54 //////////////////////////////////////////////////////////////////////////////// | 54 //////////////////////////////////////////////////////////////////////////////// |
| 55 // BrowserFrame, public: | 55 // BrowserFrame, public: |
| 56 | 56 |
| 57 BrowserFrame::BrowserFrame(BrowserView* browser_view) | 57 BrowserFrame::BrowserFrame(BrowserView* browser_view) |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { | 296 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { |
| 297 return !IsMaximized(); | 297 return !IsMaximized(); |
| 298 } | 298 } |
| 299 | 299 |
| 300 void BrowserFrame::OnUseCustomChromeFrameChanged() { | 300 void BrowserFrame::OnUseCustomChromeFrameChanged() { |
| 301 // Tell the window manager to add or remove system borders. | 301 // Tell the window manager to add or remove system borders. |
| 302 set_frame_type(UseCustomFrame() ? Widget::FRAME_TYPE_FORCE_CUSTOM | 302 set_frame_type(UseCustomFrame() ? Widget::FRAME_TYPE_FORCE_CUSTOM |
| 303 : Widget::FRAME_TYPE_FORCE_NATIVE); | 303 : Widget::FRAME_TYPE_FORCE_NATIVE); |
| 304 FrameTypeChanged(); | 304 FrameTypeChanged(); |
| 305 } | 305 } |
| OLD | NEW |