| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <gtk/gtk.h> | 5 #include <gtk/gtk.h> |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
| 10 #include "chrome/browser/accessibility_events.h" | 10 #include "chrome/browser/accessibility_events.h" |
| 11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 | 258 |
| 259 // Create the options window. | 259 // Create the options window. |
| 260 options_window = new OptionsWindowGtk(profile); | 260 options_window = new OptionsWindowGtk(profile); |
| 261 | 261 |
| 262 // Resume accessibility events. | 262 // Resume accessibility events. |
| 263 profile->ResumeAccessibilityEvents(); | 263 profile->ResumeAccessibilityEvents(); |
| 264 } | 264 } |
| 265 options_window->ShowOptionsPage(page, highlight_group); | 265 options_window->ShowOptionsPage(page, highlight_group); |
| 266 } | 266 } |
| 267 #endif // !defined(OS_CHROMEOS) | 267 #endif // !defined(OS_CHROMEOS) |
| OLD | NEW |