chrome/browser/chromeos/options/options_window_view.cc - Issue 5582002: Move:...

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

Issue 5582002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years 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

OLD	NEW
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"

6

7 #include "app/l10n_util.h"	5 #include "app/l10n_util.h"

8 #include "base/scoped_ptr.h"	6 #include "base/scoped_ptr.h"

9 #include "chrome/browser/browser_process.h"	7 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/chromeos/options/internet_page_view.h"	8 #include "chrome/browser/chromeos/options/internet_page_view.h"

11 #include "chrome/browser/chromeos/options/system_page_view.h"	9 #include "chrome/browser/chromeos/options/system_page_view.h"

12 #include "chrome/browser/gtk/options/advanced_page_gtk.h"	10 #include "chrome/browser/gtk/options/advanced_page_gtk.h"

13 #include "chrome/browser/gtk/options/content_page_gtk.h"	11 #include "chrome/browser/gtk/options/content_page_gtk.h"

14 #include "chrome/browser/gtk/options/general_page_gtk.h"	12 #include "chrome/browser/gtk/options/general_page_gtk.h"

15 #include "chrome/browser/prefs/pref_service.h"	13 #include "chrome/browser/prefs/pref_service.h"

16 #include "chrome/browser/profile.h"	14 #include "chrome/browser/profile.h"

17 #include "chrome/browser/ui/browser_list.h"	15 #include "chrome/browser/ui/browser_list.h"

18 #include "chrome/browser/ui/browser_window.h"	16 #include "chrome/browser/ui/browser_window.h"

	17 #include "chrome/browser/ui/options/options_window.h"

19 #include "chrome/browser/ui/views/accessible_view_helper.h"	18 #include "chrome/browser/ui/views/accessible_view_helper.h"

20 #include "chrome/browser/ui/views/window.h"	19 #include "chrome/browser/ui/views/window.h"

21 #include "chrome/browser/ui/window_sizer.h"	20 #include "chrome/browser/ui/window_sizer.h"

22 #include "chrome/common/chrome_constants.h"	21 #include "chrome/common/chrome_constants.h"

23 #include "chrome/common/pref_names.h"	22 #include "chrome/common/pref_names.h"

24 #include "grit/chromium_strings.h"	23 #include "grit/chromium_strings.h"

25 #include "grit/generated_resources.h"	24 #include "grit/generated_resources.h"

26 #include "grit/locale_settings.h"	25 #include "grit/locale_settings.h"

27 #include "views/controls/native/native_view_host.h"	26 #include "views/controls/native/native_view_host.h"

28 #include "views/controls/tabbed_pane/native_tabbed_pane_gtk.h"	27 #include "views/controls/tabbed_pane/native_tabbed_pane_gtk.h"

(...skipping 350 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
379 // a new one for the current active browser.	378 // a new one for the current active browser.

380 chromeos::CloseOptionsWindow();	379 chromeos::CloseOptionsWindow();

381	380

382 OptionsWindowView::instance_ = new OptionsWindowView(profile);	381 OptionsWindowView::instance_ = new OptionsWindowView(profile);

383 browser::CreateViewsWindow(chromeos::GetOptionsViewParent(),	382 browser::CreateViewsWindow(chromeos::GetOptionsViewParent(),

384 gfx::Rect(),	383 gfx::Rect(),

385 OptionsWindowView::instance_);	384 OptionsWindowView::instance_);

386	385

387 OptionsWindowView::instance_->ShowOptionsPage(page, highlight_group);	386 OptionsWindowView::instance_->ShowOptionsPage(page, highlight_group);

388 }	387 }

OLD	NEW