Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame_win.cc

Issue 10388156: Adding the flip windows button to the browser window (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 9
10 #include <set> 10 #include <set>
(...skipping 14 matching lines...) Expand all
25 #include "chrome/common/chrome_constants.h" 25 #include "chrome/common/chrome_constants.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "content/public/browser/browser_accessibility_state.h" 27 #include "content/public/browser/browser_accessibility_state.h"
28 #include "content/public/browser/page_navigator.h" 28 #include "content/public/browser/page_navigator.h"
29 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
30 #include "content/public/common/page_transition_types.h" 30 #include "content/public/common/page_transition_types.h"
31 #include "googleurl/src/gurl.h" 31 #include "googleurl/src/gurl.h"
32 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
33 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 #include "ui/base/models/simple_menu_model.h" 34 #include "ui/base/models/simple_menu_model.h"
35 #include "ui/base/resource/resource_bundle.h"
35 #include "ui/base/theme_provider.h" 36 #include "ui/base/theme_provider.h"
36 #include "ui/gfx/font.h" 37 #include "ui/gfx/font.h"
37 #include "ui/views/controls/menu/native_menu_win.h" 38 #include "ui/views/controls/menu/native_menu_win.h"
38 #include "ui/views/views_delegate.h" 39 #include "ui/views/views_delegate.h"
39 #include "ui/views/widget/native_widget_win.h" 40 #include "ui/views/widget/native_widget_win.h"
40 #include "ui/views/widget/widget.h" 41 #include "ui/views/widget/widget.h"
41 #include "ui/views/window/non_client_view.h" 42 #include "ui/views/window/non_client_view.h"
42 #include "webkit/glue/window_open_disposition.h" 43 #include "webkit/glue/window_open_disposition.h"
43 44
44 #pragma comment(lib, "dwmapi.lib") 45 #pragma comment(lib, "dwmapi.lib")
45 46
46 // static 47 // static
47 static const int kClientEdgeThickness = 3; 48 static const int kClientEdgeThickness = 3;
48 static const int kTabDragWindowAlpha = 200; 49 static const int kTabDragWindowAlpha = 200;
49 // We need to offset the DWMFrame into the toolbar so that the blackness 50 // We need to offset the DWMFrame into the toolbar so that the blackness
50 // doesn't show up on our rounded corners. 51 // doesn't show up on our rounded corners.
51 static const int kDWMFrameTopOffset = 3; 52 static const int kDWMFrameTopOffset = 3;
52 // If not -1, windows are shown with this state. 53 // If not -1, windows are shown with this state.
53 static int explicit_show_state = -1; 54 static int explicit_show_state = -1;
54 55
55 using content::OpenURLParams; 56 using content::OpenURLParams;
56 using content::Referrer; 57 using content::Referrer;
57 using content::WebContents; 58 using content::WebContents;
58 59
59 #if !defined(USE_AURA) 60 #if !defined(USE_AURA)
60 extern "C" { 61 extern "C" {
62 // Windows metro exported functions from metro_driver.
61 typedef void (*SetFrameWindow)(HWND window); 63 typedef void (*SetFrameWindow)(HWND window);
62 typedef void (*CloseFrameWindow)(HWND window); 64 typedef void (*CloseFrameWindow)(HWND window);
65 typedef void (*FlipFrameWindows)();
63 } 66 }
64 #endif // USE_AURA 67 #endif // USE_AURA
65 68
69 views::Button* MakeWindowSwitcherButton(views::ButtonListener* listener) {
70 views::ImageButton* switcher_button = new views::ImageButton(listener);
71 switcher_button->SetImage(
72 views::ImageButton::BS_NORMAL,
73 ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
74 IDR_PAGEINFO_WARNING_MINOR));
75 // TODO(cpu): Replace IDR_PAGEINFO_WARNING_MINOR with actual image.
76 switcher_button->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
77 views::ImageButton::ALIGN_MIDDLE);
78 gfx::Size ps = switcher_button->GetPreferredSize();
79 switcher_button->SetBounds(0,0, ps.width(), ps.height());
80 switcher_button->SetVisible(true);
sky 2012/05/16 21:34:52 SetVisible(true) and SetBounds shouldn't be necess
81 return switcher_button;
82 }
83
66 /////////////////////////////////////////////////////////////////////////////// 84 ///////////////////////////////////////////////////////////////////////////////
67 // BrowserFrameWin, public: 85 // BrowserFrameWin, public:
68 86
69 BrowserFrameWin::BrowserFrameWin(BrowserFrame* browser_frame, 87 BrowserFrameWin::BrowserFrameWin(BrowserFrame* browser_frame,
70 BrowserView* browser_view) 88 BrowserView* browser_view)
71 : views::NativeWidgetWin(browser_frame), 89 : views::NativeWidgetWin(browser_frame),
72 browser_view_(browser_view), 90 browser_view_(browser_view),
73 browser_frame_(browser_frame), 91 browser_frame_(browser_frame),
74 system_menu_delegate_(new SystemMenuModelDelegate(browser_view, 92 system_menu_delegate_(new SystemMenuModelDelegate(browser_view,
75 browser_view->browser())) { 93 browser_view->browser())) {
94 if (base::win::GetMetroModule())
95 browser_view->SetWindowSwitcherButton(MakeWindowSwitcherButton(this));
76 } 96 }
77 97
78 BrowserFrameWin::~BrowserFrameWin() { 98 BrowserFrameWin::~BrowserFrameWin() {
79 } 99 }
80 100
81 // static 101 // static
82 void BrowserFrameWin::SetShowState(int state) { 102 void BrowserFrameWin::SetShowState(int state) {
83 explicit_show_state = state; 103 explicit_show_state = state;
84 } 104 }
85 105
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 titlebar_info.rgrect[2].top); 276 titlebar_info.rgrect[2].top);
257 MapWindowPoints(HWND_DESKTOP, GetNativeView(), &minimize_button_corner, 1); 277 MapWindowPoints(HWND_DESKTOP, GetNativeView(), &minimize_button_corner, 1);
258 278
259 return minimize_button_corner.x; 279 return minimize_button_corner.x;
260 } 280 }
261 281
262 void BrowserFrameWin::TabStripDisplayModeChanged() { 282 void BrowserFrameWin::TabStripDisplayModeChanged() {
263 UpdateDWMFrame(); 283 UpdateDWMFrame();
264 } 284 }
265 285
286 void BrowserFrameWin::ButtonPressed(views::Button* sender,
287 const views::Event& event) {
288 HMODULE metro = base::win::GetMetroModule();
289 if (!metro)
290 return;
291 // Tell the metro_driver to flip our window. This causes the current
292 // browser window to be hidden and the next window to be shown.
293 static FlipFrameWindows flip_window_fn = reinterpret_cast<FlipFrameWindows>(
294 ::GetProcAddress(metro, "FlipFrameWindows"));
295 if (flip_window_fn)
296 flip_window_fn();
297 }
298
266 LRESULT BrowserFrameWin::OnWndProc(UINT message, 299 LRESULT BrowserFrameWin::OnWndProc(UINT message,
267 WPARAM w_param, 300 WPARAM w_param,
268 LPARAM l_param) { 301 LPARAM l_param) {
269 static const UINT metro_navigation_search_message = 302 static const UINT metro_navigation_search_message =
270 RegisterWindowMessage(chrome::kMetroNavigationAndSearchMessage); 303 RegisterWindowMessage(chrome::kMetroNavigationAndSearchMessage);
271 304
272 static const UINT metro_get_current_tab_info_message = 305 static const UINT metro_get_current_tab_info_message =
273 RegisterWindowMessage(chrome::kMetroGetCurrentTabInfoMessage); 306 RegisterWindowMessage(chrome::kMetroGetCurrentTabInfoMessage);
274 307
275 if (message == metro_navigation_search_message) { 308 if (message == metro_navigation_search_message) {
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 501
469 //////////////////////////////////////////////////////////////////////////////// 502 ////////////////////////////////////////////////////////////////////////////////
470 // NativeBrowserFrame, public: 503 // NativeBrowserFrame, public:
471 504
472 // static 505 // static
473 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( 506 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
474 BrowserFrame* browser_frame, 507 BrowserFrame* browser_frame,
475 BrowserView* browser_view) { 508 BrowserView* browser_view) {
476 return new BrowserFrameWin(browser_frame, browser_view); 509 return new BrowserFrameWin(browser_frame, browser_view);
477 } 510 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_win.h ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698