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

Side by Side Diff: chrome/browser/ui/browser_init.cc

Issue 6532045: WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/webui/filebrowse_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 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 "chrome/browser/ui/browser_init.h" 5 #include "chrome/browser/ui/browser_init.h"
6 6
7 #include <algorithm> // For max(). 7 #include <algorithm> // For max().
8 8
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/event_recorder.h" 10 #include "base/event_recorder.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #include "chrome/browser/chromeos/enterprise_extension_observer.h" 86 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
87 #include "chrome/browser/chromeos/gview_request_interceptor.h" 87 #include "chrome/browser/chromeos/gview_request_interceptor.h"
88 #include "chrome/browser/chromeos/low_battery_observer.h" 88 #include "chrome/browser/chromeos/low_battery_observer.h"
89 #include "chrome/browser/chromeos/network_message_observer.h" 89 #include "chrome/browser/chromeos/network_message_observer.h"
90 #include "chrome/browser/chromeos/network_state_notifier.h" 90 #include "chrome/browser/chromeos/network_state_notifier.h"
91 #include "chrome/browser/chromeos/system_key_event_listener.h" 91 #include "chrome/browser/chromeos/system_key_event_listener.h"
92 #include "chrome/browser/chromeos/update_observer.h" 92 #include "chrome/browser/chromeos/update_observer.h"
93 #include "chrome/browser/chromeos/usb_mount_observer.h" 93 #include "chrome/browser/chromeos/usb_mount_observer.h"
94 #include "chrome/browser/chromeos/wm_message_listener.h" 94 #include "chrome/browser/chromeos/wm_message_listener.h"
95 #include "chrome/browser/chromeos/wm_overview_controller.h" 95 #include "chrome/browser/chromeos/wm_overview_controller.h"
96 #include "chrome/browser/dom_ui/mediaplayer_ui.h" 96 #include "chrome/browser/webui/mediaplayer_ui.h"
97 #endif 97 #endif
98 98
99 #if defined(HAVE_XINPUT2) 99 #if defined(HAVE_XINPUT2)
100 #include "views/focus/accelerator_handler.h" 100 #include "views/focus/accelerator_handler.h"
101 #endif 101 #endif
102 102
103 namespace { 103 namespace {
104 104
105 // SetAsDefaultBrowserTask ---------------------------------------------------- 105 // SetAsDefaultBrowserTask ----------------------------------------------------
106 106
(...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 return false; 1274 return false;
1275 automation->SetExpectedTabCount(expected_tabs); 1275 automation->SetExpectedTabCount(expected_tabs);
1276 1276
1277 AutomationProviderList* list = 1277 AutomationProviderList* list =
1278 g_browser_process->InitAutomationProviderList(); 1278 g_browser_process->InitAutomationProviderList();
1279 DCHECK(list); 1279 DCHECK(list);
1280 list->AddProvider(automation); 1280 list->AddProvider(automation);
1281 1281
1282 return true; 1282 return true;
1283 } 1283 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/webui/filebrowse_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698