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_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 #include <set> | 9 #include <set> |
10 | 10 |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 return; | 151 return; |
152 CloseFrameWindow close_frame_window = reinterpret_cast<CloseFrameWindow>( | 152 CloseFrameWindow close_frame_window = reinterpret_cast<CloseFrameWindow>( |
153 ::GetProcAddress(metro, "CloseFrameWindow")); | 153 ::GetProcAddress(metro, "CloseFrameWindow")); |
154 close_frame_window(browser_frame_->GetNativeWindow()); | 154 close_frame_window(browser_frame_->GetNativeWindow()); |
155 } | 155 } |
156 | 156 |
157 | 157 |
158 /////////////////////////////////////////////////////////////////////////////// | 158 /////////////////////////////////////////////////////////////////////////////// |
159 // BrowserFrameWin, views::NativeWidgetWin overrides: | 159 // BrowserFrameWin, views::NativeWidgetWin overrides: |
160 | 160 |
161 int BrowserFrameWin::GetShowState() const { | 161 int BrowserFrameWin::GetInitialShowState() const { |
162 if (explicit_show_state != -1) | 162 if (explicit_show_state != -1) |
163 return explicit_show_state; | 163 return explicit_show_state; |
164 | 164 |
165 STARTUPINFO si = {0}; | 165 STARTUPINFO si = {0}; |
166 si.cb = sizeof(si); | 166 si.cb = sizeof(si); |
167 si.dwFlags = STARTF_USESHOWWINDOW; | 167 si.dwFlags = STARTF_USESHOWWINDOW; |
168 GetStartupInfo(&si); | 168 GetStartupInfo(&si); |
169 return si.wShowWindow; | 169 return si.wShowWindow; |
170 } | 170 } |
171 | 171 |
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
603 | 603 |
604 //////////////////////////////////////////////////////////////////////////////// | 604 //////////////////////////////////////////////////////////////////////////////// |
605 // NativeBrowserFrame, public: | 605 // NativeBrowserFrame, public: |
606 | 606 |
607 // static | 607 // static |
608 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( | 608 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( |
609 BrowserFrame* browser_frame, | 609 BrowserFrame* browser_frame, |
610 BrowserView* browser_view) { | 610 BrowserView* browser_view) { |
611 return new BrowserFrameWin(browser_frame, browser_view); | 611 return new BrowserFrameWin(browser_frame, browser_view); |
612 } | 612 } |
OLD | NEW |