Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(811)

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

Issue 1442001: GTK: Turn on the GTK+ integration by default. (Closed)
Patch Set: Only use gtk in gnome/xfce by default Created 10 years, 9 months 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
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/gtk/options/advanced_contents_gtk.h" 5 #include "chrome/browser/gtk/options/advanced_contents_gtk.h"
6 6
7 #include <sys/types.h> 7 #include <sys/types.h>
8 #include <sys/wait.h> 8 #include <sys/wait.h>
9 9
10 #include "app/gtk_signal.h" 10 #include "app/gtk_signal.h"
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 case base::DESKTOP_ENVIRONMENT_KDE3: 413 case base::DESKTOP_ENVIRONMENT_KDE3:
414 command.argv = kKDE3ProxyConfigCommand; 414 command.argv = kKDE3ProxyConfigCommand;
415 found_command = SearchPATH(&command, 1, NULL); 415 found_command = SearchPATH(&command, 1, NULL);
416 break; 416 break;
417 417
418 case base::DESKTOP_ENVIRONMENT_KDE4: 418 case base::DESKTOP_ENVIRONMENT_KDE4:
419 command.argv = kKDE4ProxyConfigCommand; 419 command.argv = kKDE4ProxyConfigCommand;
420 found_command = SearchPATH(&command, 1, NULL); 420 found_command = SearchPATH(&command, 1, NULL);
421 break; 421 break;
422 422
423 case base::DESKTOP_ENVIRONMENT_XFCE:
423 case base::DESKTOP_ENVIRONMENT_OTHER: 424 case base::DESKTOP_ENVIRONMENT_OTHER:
424 break; 425 break;
425 } 426 }
426 427
427 if (found_command) { 428 if (found_command) {
428 StartProxyConfigUtil(command); 429 StartProxyConfigUtil(command);
429 } else { 430 } else {
430 const char* name = base::GetDesktopEnvironmentName(env_getter.get()); 431 const char* name = base::GetDesktopEnvironmentName(env_getter.get());
431 if (name) 432 if (name)
432 LOG(ERROR) << "Could not find " << name << " network settings in $PATH"; 433 LOG(ERROR) << "Could not find " << name << " network settings in $PATH";
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
1212 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT), 1213 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT),
1213 web_content_section_->get_page_widget(), false); 1214 web_content_section_->get_page_widget(), false);
1214 1215
1215 security_section_.reset(new SecuritySection(profile_)); 1216 security_section_.reset(new SecuritySection(profile_));
1216 options_builder.AddOptionGroup( 1217 options_builder.AddOptionGroup(
1217 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY), 1218 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY),
1218 security_section_->get_page_widget(), false); 1219 security_section_->get_page_widget(), false);
1219 1220
1220 page_ = options_builder.get_page_widget(); 1221 page_ = options_builder.get_page_widget();
1221 } 1222 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698