Chromium Code Reviews

Side by Side Diff: chrome/browser/chromeos/options/options_window_view.cc

Issue 3538012: Use BubbleWindow for ChromeOS windows/dialogs. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: fix win trybot Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/options_window.h" 5 #include "chrome/browser/options_window.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/scoped_ptr.h" 8 #include "base/scoped_ptr.h"
9 #include "chrome/browser/browser_list.h" 9 #include "chrome/browser/browser_list.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/browser_window.h" 11 #include "chrome/browser/browser_window.h"
12 #include "chrome/browser/chromeos/options/internet_page_view.h" 12 #include "chrome/browser/chromeos/options/internet_page_view.h"
13 #include "chrome/browser/chromeos/options/system_page_view.h" 13 #include "chrome/browser/chromeos/options/system_page_view.h"
14 #include "chrome/browser/gtk/options/advanced_page_gtk.h" 14 #include "chrome/browser/gtk/options/advanced_page_gtk.h"
15 #include "chrome/browser/gtk/options/content_page_gtk.h" 15 #include "chrome/browser/gtk/options/content_page_gtk.h"
16 #include "chrome/browser/gtk/options/general_page_gtk.h" 16 #include "chrome/browser/gtk/options/general_page_gtk.h"
17 #include "chrome/browser/prefs/pref_service.h" 17 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/browser/profile.h" 18 #include "chrome/browser/profile.h"
19 #include "chrome/browser/views/accessible_view_helper.h" 19 #include "chrome/browser/views/accessible_view_helper.h"
20 #include "chrome/browser/views/window.h"
20 #include "chrome/browser/window_sizer.h" 21 #include "chrome/browser/window_sizer.h"
21 #include "chrome/common/chrome_constants.h" 22 #include "chrome/common/chrome_constants.h"
22 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
23 #include "grit/chromium_strings.h" 24 #include "grit/chromium_strings.h"
24 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
25 #include "grit/locale_settings.h" 26 #include "grit/locale_settings.h"
26 #include "views/controls/native/native_view_host.h" 27 #include "views/controls/native/native_view_host.h"
27 #include "views/controls/tabbed_pane/native_tabbed_pane_gtk.h" 28 #include "views/controls/tabbed_pane/native_tabbed_pane_gtk.h"
28 #include "views/controls/tabbed_pane/tabbed_pane.h" 29 #include "views/controls/tabbed_pane/tabbed_pane.h"
29 #include "views/widget/root_view.h" 30 #include "views/widget/root_view.h"
(...skipping 342 matching lines...)
372 Profile* profile) { 373 Profile* profile) {
373 DCHECK(profile); 374 DCHECK(profile);
374 375
375 using chromeos::OptionsWindowView; 376 using chromeos::OptionsWindowView;
376 377
377 // If there's already an existing options window, close it and create 378 // If there's already an existing options window, close it and create
378 // a new one for the current active browser. 379 // a new one for the current active browser.
379 chromeos::CloseOptionsWindow(); 380 chromeos::CloseOptionsWindow();
380 381
381 OptionsWindowView::instance_ = new OptionsWindowView(profile); 382 OptionsWindowView::instance_ = new OptionsWindowView(profile);
382 views::Window::CreateChromeWindow(chromeos::GetOptionsViewParent(), 383 browser::CreateViewsWindow(chromeos::GetOptionsViewParent(),
383 gfx::Rect(), 384 gfx::Rect(),
384 OptionsWindowView::instance_); 385 OptionsWindowView::instance_);
385 386
386 OptionsWindowView::instance_->ShowOptionsPage(page, highlight_group); 387 OptionsWindowView::instance_->ShowOptionsPage(page, highlight_group);
387 } 388 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/language_config_view.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine