diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-10 05:58:40 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-10 05:58:40 +0000 |
| commit | 3ee83f2c99cecee4f712cbb6fd9084cb676287a0 (patch) | |
| tree | 54d504f603c3277de2100ca8df544d141f2976d0 /views/widget | |
| parent | b1c25a2fdeade0e807af70df8136d5efa62033d2 (diff) | |
| download | chromium_src-3ee83f2c99cecee4f712cbb6fd9084cb676287a0.zip chromium_src-3ee83f2c99cecee4f712cbb6fd9084cb676287a0.tar.gz chromium_src-3ee83f2c99cecee4f712cbb6fd9084cb676287a0.tar.bz2 | |
Add a new ViewsDelegate interface and implementation in the windows browser UI.
Provides a way for saving and restoring window placement, obtaining system helpers etc.
http://crbug.com/11633
TEST=make sure window placement saving works, clipboard, and that windows in the taskbar have a chrome icon.
Review URL: http://codereview.chromium.org/113173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/widget_win.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index 25f25da..b092682 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -9,11 +9,11 @@ #include "base/gfx/native_theme.h" #include "base/string_util.h" #include "base/win_util.h" -#include "chrome/app/chrome_dll_resource.h" #include "views/accessibility/view_accessibility.h" #include "views/controls/native_control_win.h" #include "views/fill_layout.h" #include "views/focus/focus_util_win.h" +#include "views/views_delegate.h" #include "views/widget/aero_tooltip_manager.h" #include "views/widget/default_theme_provider.h" #include "views/widget/root_view.h" @@ -920,8 +920,9 @@ std::wstring WidgetWin::GetWindowClassName() { class_ex.cbClsExtra = 0; class_ex.cbWndExtra = 0; class_ex.hInstance = NULL; - class_ex.hIcon = LoadIcon(GetModuleHandle(L"chrome.dll"), - MAKEINTRESOURCE(IDR_MAINFRAME)); + class_ex.hIcon = NULL; + if (ViewsDelegate::views_delegate) + class_ex.hIcon = ViewsDelegate::views_delegate->GetDefaultWindowIcon(); class_ex.hCursor = LoadCursor(NULL, IDC_ARROW); class_ex.hbrBackground = reinterpret_cast<HBRUSH>(class_info.background + 1); class_ex.lpszMenuName = NULL; |