diff options
Diffstat (limited to 'chrome')
25 files changed, 46 insertions, 34 deletions
diff --git a/chrome/browser/chromeos/frame/bubble_frame_view.cc b/chrome/browser/chromeos/frame/bubble_frame_view.cc index 37acb39..49c9281 100644 --- a/chrome/browser/chromeos/frame/bubble_frame_view.cc +++ b/chrome/browser/chromeos/frame/bubble_frame_view.cc @@ -227,7 +227,7 @@ void BubbleFrameView::OnPaint(gfx::Canvas* canvas) { void BubbleFrameView::ButtonPressed(views::Button* sender, const views::Event& event) { if (close_button_ != NULL && sender == close_button_) - frame_->Close(); + frame_->CloseWindow(); } } // namespace chromeos diff --git a/chrome/browser/chromeos/native_dialog_window.cc b/chrome/browser/chromeos/native_dialog_window.cc index 7960580..61ed3c8 100644 --- a/chrome/browser/chromeos/native_dialog_window.cc +++ b/chrome/browser/chromeos/native_dialog_window.cc @@ -155,7 +155,7 @@ void NativeDialogHost::OnCheckResize(GtkWidget* widget) { void NativeDialogHost::OnDialogDestroy(GtkWidget* widget) { dialog_ = NULL; destroy_signal_id_ = 0; - window()->Close(); + window()->CloseWindow(); } /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 0f6a0f5..ec71c80 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -431,7 +431,7 @@ void FirstRun::ShowFirstRunDialog(Profile* profile, search_engine_dialog->Show(); views::AcceleratorHandler accelerator_handler; MessageLoopForUI::current()->Run(&accelerator_handler); - search_engine_dialog->Close(); + search_engine_dialog->CloseWindow(); } // static diff --git a/chrome/browser/ui/input_window_dialog_win.cc b/chrome/browser/ui/input_window_dialog_win.cc index 7012d10..058ffd1 100644 --- a/chrome/browser/ui/input_window_dialog_win.cc +++ b/chrome/browser/ui/input_window_dialog_win.cc @@ -220,7 +220,7 @@ void WinInputWindowDialog::Show() { } void WinInputWindowDialog::Close() { - window_->Close(); + window_->CloseWindow(); } // static diff --git a/chrome/browser/ui/views/accessibility_event_router_views.cc b/chrome/browser/ui/views/accessibility_event_router_views.cc index 48e5514..c99022b 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views.cc @@ -24,6 +24,8 @@ #include "views/controls/menu/submenu_view.h" #include "views/controls/textfield/textfield.h" #include "views/view.h" +#include "views/widget/native_widget.h" +#include "views/widget/widget.h" #include "views/window/window.h" using views::FocusManager; @@ -124,8 +126,9 @@ void AccessibilityEventRouterViews::DispatchAccessibilityNotification( Profile* profile = NULL; views::Window* window = view->GetWindow(); if (window) { - profile = reinterpret_cast<Profile*>(window->GetNativeWindowProperty( - Profile::kProfileKey)); + profile = reinterpret_cast<Profile*>( + window->AsWidget()->native_widget()->GetNativeWindowProperty( + Profile::kProfileKey)); } if (!profile) profile = most_recent_profile_; diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc index 93e5c24..6aae653 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc @@ -16,6 +16,7 @@ #include "views/controls/button/native_button.h" #include "views/layout/grid_layout.h" #include "views/views_delegate.h" +#include "views/widget/native_widget.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" #include "views/window/window.h" @@ -158,7 +159,7 @@ TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) { // Create a profile and associate it with this window. TestingProfile profile; - window->SetNativeWindowProperty( + window->AsWidget()->native_widget()->SetNativeWindowProperty( Profile::kProfileKey, &profile); // Change the accessible name of button3. diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index ffb3579..949bd40 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -1361,7 +1361,7 @@ class BookmarkBarViewTest16 : public BookmarkBarViewEventTestBase { ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED); // Close the window. - window_->Close(); + window_->CloseWindow(); window_ = NULL; } }; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 897c92d..4433a54 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -237,7 +237,7 @@ void BookmarkEditorView::Show(HWND parent_hwnd) { void BookmarkEditorView::Close() { DCHECK(window()); - window()->Close(); + window()->CloseWindow(); } void BookmarkEditorView::ShowContextMenuForView(View* source, @@ -391,7 +391,7 @@ void BookmarkEditorView::BookmarkNodeRemoved(BookmarkModel* model, details_.existing_node->HasAncestor(node)) || (parent_ && parent_->HasAncestor(node))) { // The node, or its parent was removed. Close the dialog. - window()->Close(); + window()->CloseWindow(); } else { Reset(); } diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index 959e4e2..9216388 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc @@ -15,6 +15,8 @@ #include "chrome/common/pref_names.h" #include "ui/base/clipboard/clipboard.h" #include "ui/gfx/rect.h" +#include "views/widget/native_widget.h" +#include "views/widget/widget.h" #include "views/window/window.h" #if defined(OS_WIN) @@ -30,8 +32,8 @@ namespace { // TODO(mirandac): This function will also separate windows by profile in a // multi-profile environment. PrefService* GetPrefsForWindow(views::Window* window) { - Profile* profile = - reinterpret_cast<Profile*>(window->GetNativeWindowProperty( + Profile* profile = reinterpret_cast<Profile*>( + window->AsWidget()->native_widget()->GetNativeWindowProperty( Profile::kProfileKey)); if (!profile) { // Use local state for windows that have no explicit profile. diff --git a/chrome/browser/ui/views/clear_browsing_data_view.cc b/chrome/browser/ui/views/clear_browsing_data_view.cc index 86c74d6..e7b007b 100644 --- a/chrome/browser/ui/views/clear_browsing_data_view.cc +++ b/chrome/browser/ui/views/clear_browsing_data_view.cc @@ -481,5 +481,5 @@ void ClearBrowsingDataView::OnBrowsingDataRemoverDone() { // No need to remove ourselves as an observer as BrowsingDataRemover deletes // itself after we return. remover_ = NULL; - window()->Close(); + window()->CloseWindow(); } diff --git a/chrome/browser/ui/views/clear_data_view.cc b/chrome/browser/ui/views/clear_data_view.cc index c5d3b33..82c7a34 100644 --- a/chrome/browser/ui/views/clear_data_view.cc +++ b/chrome/browser/ui/views/clear_data_view.cc @@ -78,7 +78,7 @@ void ClearDataView::StartClearingBrowsingData() { } void ClearDataView::StopClearingBrowsingData() { - window()->Close(); + window()->CloseWindow(); } void ClearDataView::StartClearingServerData() { @@ -90,7 +90,7 @@ void ClearDataView::StartClearingServerData() { } void ClearDataView::SucceededClearingServerData() { - window()->Close(); + window()->CloseWindow(); } void ClearDataView::FailedClearingServerData() { diff --git a/chrome/browser/ui/views/constrained_window_win.cc b/chrome/browser/ui/views/constrained_window_win.cc index e0630d6..3f6f678 100644 --- a/chrome/browser/ui/views/constrained_window_win.cc +++ b/chrome/browser/ui/views/constrained_window_win.cc @@ -592,7 +592,7 @@ void ConstrainedWindowWin::CloseConstrainedWindow() { Source<ConstrainedWindow>(this), NotificationService::NoDetails()); - Window::Close(); + Window::CloseWindow(); } std::wstring ConstrainedWindowWin::GetWindowTitle() const { diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc index 631d4ba..c6494b9 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc @@ -241,7 +241,7 @@ void AppPanelBrowserFrameView::Layout() { void AppPanelBrowserFrameView::ButtonPressed(views::Button* sender, const views::Event& event) { if (sender == close_button_) - frame_->GetWindow()->Close(); + frame_->GetWindow()->CloseWindow(); } /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index dcaa1403..f878ca4 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -90,6 +90,7 @@ #include "chrome/browser/jumplist_win.h" #include "ui/base/message_box_win.h" #include "ui/base/view_prop.h" +#include "views/window/window_win.h" #elif defined(OS_LINUX) #include "chrome/browser/ui/views/accelerator_table_gtk.h" #include "views/window/hit_test.h" @@ -722,7 +723,7 @@ void BrowserView::SetBounds(const gfx::Rect& bounds) { void BrowserView::Close() { BrowserBubbleHost::Close(); - frame_->GetWindow()->Close(); + frame_->GetWindow()->CloseWindow(); } void BrowserView::Activate() { @@ -2192,7 +2193,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen) { #endif } #if defined(OS_WIN) - frame_->GetWindow()->PushForceHidden(); + static_cast<views::WindowWin*>( + frame_->GetWindow()->native_window())->PushForceHidden(); #endif // Notify bookmark bar, so it can set itself to the appropriate drawing state. @@ -2233,7 +2235,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen) { ignore_layout_ = false; Layout(); #if defined(OS_WIN) - frame_->GetWindow()->PopForceHidden(); + static_cast<views::WindowWin*>( + frame_->GetWindow()->native_window())->PopForceHidden(); #endif } diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 2622b03..f4c8832 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -421,7 +421,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Button* sender, else if (sender == restore_button_) window->Restore(); else if (sender == close_button_) - window->Close(); + window->CloseWindow(); } /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index 1659c5a..b9c704c 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -144,7 +144,7 @@ void HtmlDialogView::OnDialogClosed(const std::string& json_retval) { delegate_ = NULL; // We will not communicate further with the delegate. dialog_delegate->OnDialogClosed(json_retval); } - window()->Close(); + window()->CloseWindow(); } void HtmlDialogView::OnCloseContents(TabContents* source, diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index ef774bb..8c41726 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -261,7 +261,7 @@ void HungRendererDialogView::EndForTabContents(TabContents* contents) { DCHECK(contents); if (contents_ && contents_->GetRenderProcessHost() == contents->GetRenderProcessHost()) { - window()->Close(); + window()->CloseWindow(); // Since we're closing, we no longer need this TabContents. contents_ = NULL; } diff --git a/chrome/browser/ui/views/importer/import_dialog_view.cc b/chrome/browser/ui/views/importer/import_dialog_view.cc index 7d2a73f..ef7b49c 100644 --- a/chrome/browser/ui/views/importer/import_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_dialog_view.cc @@ -291,7 +291,7 @@ void ImportDialogView::SourceProfilesLoaded() { void ImportDialogView::ImportCompleted() { // Now close this window since the import completed or was canceled. - window()->Close(); + window()->CloseWindow(); } void ImportDialogView::ImportCanceled() { diff --git a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc index 36657e2..1baefe7 100644 --- a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc @@ -276,7 +276,7 @@ void ImportProgressDialogView::ImportEnded() { // In every case, we need to close the UI now. importing_ = false; importer_host_->SetObserver(NULL); - window()->Close(); + window()->CloseWindow(); if (importer_observer_) importer_observer_->ImportCompleted(); } diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index f6ae4d6..b4fac4c 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -53,7 +53,7 @@ void JSModalDialogViews::ActivateAppModalDialog() { } void JSModalDialogViews::CloseAppModalDialog() { - window()->Close(); + window()->CloseWindow(); } void JSModalDialogViews::AcceptAppModalDialog() { diff --git a/chrome/browser/ui/views/keyword_editor_view.cc b/chrome/browser/ui/views/keyword_editor_view.cc index 38e0dee..d8125e1 100644 --- a/chrome/browser/ui/views/keyword_editor_view.cc +++ b/chrome/browser/ui/views/keyword_editor_view.cc @@ -70,7 +70,7 @@ void KeywordEditorView::ShowAndObserve(Profile* profile, return; if (open_window != NULL) - open_window->Close(); + open_window->CloseWindow(); DCHECK(!open_window); // Both of these will be deleted when the dialog closes. diff --git a/chrome/browser/ui/views/options/options_window_view.cc b/chrome/browser/ui/views/options/options_window_view.cc index 7126f7d..aef8719 100644 --- a/chrome/browser/ui/views/options/options_window_view.cc +++ b/chrome/browser/ui/views/options/options_window_view.cc @@ -20,6 +20,8 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/widget/root_view.h" +#include "views/widget/widget.h" +#include "views/widget/native_widget.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" @@ -223,7 +225,8 @@ void OptionsWindowView::Init() { // Bind the profile to the window so that the ChromeViewsDelegate can find // the user preferences to store and retrieve window placement settings. - window()->SetNativeWindowProperty(Profile::kProfileKey, profile_); + window()->AsWidget()->native_widget()->SetNativeWindowProperty( + Profile::kProfileKey, profile_); DCHECK(tabs_->GetTabCount() == OPTIONS_PAGE_COUNT); } diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index 489194c..0d291ea 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -559,7 +559,7 @@ void TaskManagerView::Show(bool highlight_background_resources) { if (instance_) { if (instance_->highlight_background_resources_ != highlight_background_resources) { - instance_->window()->Close(); + instance_->window()->CloseWindow(); } else { // If there's a Task manager window open already, just activate it. instance_->window()->Activate(); diff --git a/chrome/browser/ui/views/url_picker.cc b/chrome/browser/ui/views/url_picker.cc index 7d6060b..36d9411 100644 --- a/chrome/browser/ui/views/url_picker.cc +++ b/chrome/browser/ui/views/url_picker.cc @@ -128,7 +128,7 @@ void UrlPicker::Show(HWND parent) { void UrlPicker::Close() { DCHECK(window()); - window()->Close(); + window()->CloseWindow(); } std::wstring UrlPicker::GetWindowTitle() const { @@ -193,7 +193,7 @@ gfx::Size UrlPicker::GetPreferredSize() { bool UrlPicker::AcceleratorPressed( const views::Accelerator& accelerator) { if (accelerator.GetKeyCode() == VK_ESCAPE) { - window()->Close(); + window()->CloseWindow(); } else if (accelerator.GetKeyCode() == VK_RETURN) { views::FocusManager* fm = GetFocusManager(); if (fm->GetFocusedView() == url_table_) { @@ -205,7 +205,7 @@ bool UrlPicker::AcceleratorPressed( if (GetInputURL().is_valid()) { PerformModelChange(); if (window()) - window()->Close(); + window()->CloseWindow(); } else { url_field_->SelectAll(); } @@ -237,7 +237,7 @@ void UrlPicker::OnDoubleClick() { OnSelectionChanged(); PerformModelChange(); if (window()) - window()->Close(); + window()->CloseWindow(); } } diff --git a/chrome/test/interactive_ui/view_event_test_base.cc b/chrome/test/interactive_ui/view_event_test_base.cc index e717497..027c93f 100644 --- a/chrome/test/interactive_ui/view_event_test_base.cc +++ b/chrome/test/interactive_ui/view_event_test_base.cc @@ -88,7 +88,7 @@ void ViewEventTestBase::TearDown() { #if defined(OS_WIN) DestroyWindow(window_->GetNativeWindow()); #else - window_->Close(); + window_->CloseWindow(); MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); ui_test_utils::RunMessageLoop(); #endif |