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

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

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 typedef void (*SetFrameWindow)(HWND window); 63 typedef void (*SetFrameWindow)(HWND window);
64 typedef void (*CloseFrameWindow)(HWND window); 64 typedef void (*CloseFrameWindow)(HWND window);
65 typedef void (*FlipFrameWindows)(); 65 typedef void (*FlipFrameWindows)();
66 } 66 }
67 #endif // USE_AURA 67 #endif // USE_AURA
68 68
69 views::Button* MakeWindowSwitcherButton(views::ButtonListener* listener) { 69 views::Button* MakeWindowSwitcherButton(views::ButtonListener* listener) {
70 views::ImageButton* switcher_button = new views::ImageButton(listener); 70 views::ImageButton* switcher_button = new views::ImageButton(listener);
71 switcher_button->SetImage( 71 switcher_button->SetImage(
72 views::ImageButton::BS_NORMAL, 72 views::ImageButton::BS_NORMAL,
73 ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( 73 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
74 IDR_PAGEINFO_WARNING_MINOR)); 74 IDR_PAGEINFO_WARNING_MINOR));
75 // TODO(cpu): Replace IDR_PAGEINFO_WARNING_MINOR with actual image. 75 // TODO(cpu): Replace IDR_PAGEINFO_WARNING_MINOR with actual image.
76 switcher_button->SetImageAlignment(views::ImageButton::ALIGN_CENTER, 76 switcher_button->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
77 views::ImageButton::ALIGN_MIDDLE); 77 views::ImageButton::ALIGN_MIDDLE);
78 return switcher_button; 78 return switcher_button;
79 } 79 }
80 80
81 /////////////////////////////////////////////////////////////////////////////// 81 ///////////////////////////////////////////////////////////////////////////////
82 // BrowserFrameWin, public: 82 // BrowserFrameWin, public:
83 83
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 498
499 //////////////////////////////////////////////////////////////////////////////// 499 ////////////////////////////////////////////////////////////////////////////////
500 // NativeBrowserFrame, public: 500 // NativeBrowserFrame, public:
501 501
502 // static 502 // static
503 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( 503 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
504 BrowserFrame* browser_frame, 504 BrowserFrame* browser_frame,
505 BrowserView* browser_view) { 505 BrowserView* browser_view) {
506 return new BrowserFrameWin(browser_frame, browser_view); 506 return new BrowserFrameWin(browser_frame, browser_view);
507 } 507 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698