| 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/ui/views/frame/browser_frame_win.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame_win.h" |
| 6 | 6 |
| 7 #include <dwmapi.h> | 7 #include <dwmapi.h> |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 | 9 |
| 10 #include <set> | 10 #include <set> |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 browser_view_->set_frame(this); | 53 browser_view_->set_frame(this); |
| 54 non_client_view()->SetFrameView(CreateFrameViewForWindow()); | 54 non_client_view()->SetFrameView(CreateFrameViewForWindow()); |
| 55 // Don't focus anything on creation, selecting a tab will set the focus. | 55 // Don't focus anything on creation, selecting a tab will set the focus. |
| 56 set_focus_on_creation(false); | 56 set_focus_on_creation(false); |
| 57 } | 57 } |
| 58 | 58 |
| 59 BrowserFrameWin::~BrowserFrameWin() { | 59 BrowserFrameWin::~BrowserFrameWin() { |
| 60 } | 60 } |
| 61 | 61 |
| 62 void BrowserFrameWin::InitBrowserFrame() { | 62 void BrowserFrameWin::InitBrowserFrame() { |
| 63 WindowWin::Init(NULL, gfx::Rect()); | 63 GetWidget()->Init(views::Widget::WindowCreateParams()); |
| 64 } | 64 } |
| 65 | 65 |
| 66 // static | 66 // static |
| 67 void BrowserFrameWin::SetShowState(int state) { | 67 void BrowserFrameWin::SetShowState(int state) { |
| 68 explicit_show_state = state; | 68 explicit_show_state = state; |
| 69 } | 69 } |
| 70 | 70 |
| 71 /////////////////////////////////////////////////////////////////////////////// | 71 /////////////////////////////////////////////////////////////////////////////// |
| 72 // BrowserFrameWin, views::WindowWin overrides: | 72 // BrowserFrameWin, views::WindowWin overrides: |
| 73 | 73 |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 //////////////////////////////////////////////////////////////////////////////// | 271 //////////////////////////////////////////////////////////////////////////////// |
| 272 // BrowserFrame, public: | 272 // BrowserFrame, public: |
| 273 | 273 |
| 274 // static | 274 // static |
| 275 const gfx::Font& BrowserFrame::GetTitleFont() { | 275 const gfx::Font& BrowserFrame::GetTitleFont() { |
| 276 static gfx::Font* title_font = | 276 static gfx::Font* title_font = |
| 277 new gfx::Font(views::WindowWin::GetWindowTitleFont()); | 277 new gfx::Font(views::WindowWin::GetWindowTitleFont()); |
| 278 return *title_font; | 278 return *title_font; |
| 279 } | 279 } |
| 280 | 280 |
| OLD | NEW |