chrome/browser/gtk/options/general_page_gtk.cc - Issue 5606002: Move:...

Side by Side Diff: chrome/browser/gtk/options/general_page_gtk.cc

Issue 5606002: 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

« no previous file with comments | « chrome/browser/gtk/options/fonts_page_gtk.cc ('k') | chrome/browser/gtk/options/languages_page_gtk.cc » ('j') | no next file with comments »

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/gtk/options/general_page_gtk.h"	5 #include "chrome/browser/gtk/options/general_page_gtk.h"

6	6

7 #include <set>	7 #include <set>

8 #include <vector>	8 #include <vector>

9	9

10 #include "app/l10n_util.h"	10 #include "app/l10n_util.h"

11 #include "base/callback.h"	11 #include "base/callback.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/utf_string_conversions.h"	13 #include "base/utf_string_conversions.h"

14 #include "chrome/browser/custom_home_pages_table_model.h"	14 #include "chrome/browser/custom_home_pages_table_model.h"

15 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"	15 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"

16 #include "chrome/browser/gtk/gtk_chrome_link_button.h"	16 #include "chrome/browser/gtk/gtk_chrome_link_button.h"

17 #include "chrome/browser/gtk/gtk_util.h"	17 #include "chrome/browser/gtk/gtk_util.h"

18 #include "chrome/browser/gtk/keyword_editor_view.h"	18 #include "chrome/browser/gtk/keyword_editor_view.h"

19 #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h"	19 #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h"

20 #include "chrome/browser/gtk/options/options_layout_gtk.h"	20 #include "chrome/browser/gtk/options/options_layout_gtk.h"

21 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"	21 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"

22 #include "chrome/browser/instant/instant_confirm_dialog.h"	22 #include "chrome/browser/instant/instant_confirm_dialog.h"

23 #include "chrome/browser/instant/instant_controller.h"	23 #include "chrome/browser/instant/instant_controller.h"

24 #include "chrome/browser/net/url_fixer_upper.h"	24 #include "chrome/browser/net/url_fixer_upper.h"

25 #include "chrome/browser/prefs/pref_service.h"	25 #include "chrome/browser/prefs/pref_service.h"

26 #include "chrome/browser/prefs/session_startup_pref.h"	26 #include "chrome/browser/prefs/session_startup_pref.h"

27 #include "chrome/browser/profile.h"	27 #include "chrome/browser/profiles/profile.h"

28 #include "chrome/browser/search_engines/template_url.h"	28 #include "chrome/browser/search_engines/template_url.h"

29 #include "chrome/browser/search_engines/template_url_model.h"	29 #include "chrome/browser/search_engines/template_url_model.h"

30 #include "chrome/browser/ui/options/show_options_url.h"	30 #include "chrome/browser/ui/options/show_options_url.h"

31 #include "chrome/common/chrome_switches.h"	31 #include "chrome/common/chrome_switches.h"

32 #include "chrome/common/notification_service.h"	32 #include "chrome/common/notification_service.h"

33 #include "chrome/common/pref_names.h"	33 #include "chrome/common/pref_names.h"

34 #include "chrome/common/url_constants.h"	34 #include "chrome/common/url_constants.h"

35 #include "gfx/gtk_util.h"	35 #include "gfx/gtk_util.h"

36 #include "grit/chromium_strings.h"	36 #include "grit/chromium_strings.h"

37 #include "grit/generated_resources.h"	37 #include "grit/generated_resources.h"

(...skipping 760 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
798 int desired_width = allocation->x - sender->parent->allocation.x;	798 int desired_width = allocation->x - sender->parent->allocation.x;

799 GtkRequisition req;	799 GtkRequisition req;

800 gtk_widget_size_request(instant_indent_, &req);	800 gtk_widget_size_request(instant_indent_, &req);

801 if (req.width != desired_width)	801 if (req.width != desired_width)

802 gtk_widget_set_size_request(instant_indent_, desired_width, -1);	802 gtk_widget_set_size_request(instant_indent_, desired_width, -1);

803 }	803 }

804	804

805 void GeneralPageGtk::OnSearchLearnMoreClicked(GtkWidget* sender) {	805 void GeneralPageGtk::OnSearchLearnMoreClicked(GtkWidget* sender) {

806 browser::ShowOptionsURL(profile(), GURL(browser::kInstantLearnMoreURL));	806 browser::ShowOptionsURL(profile(), GURL(browser::kInstantLearnMoreURL));

807 }	807 }

OLD	NEW