Commit 65c81144 authored by thestig@chromium.org's avatar thestig@chromium.org

IWYU and other random cleanup in chrome/browser/ui.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10810027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149249 0039d316-1c4b-4281-b951-d872f2087c98
parent 310512cc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/string_number_conversions.h" #include "base/string_number_conversions.h"
#include "base/string_split.h" #include "base/string_split.h"
#include "chrome/browser/browser_process_impl.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/audio/audio_handler.h" #include "chrome/browser/chromeos/audio/audio_handler.h"
#include "chrome/browser/chromeos/boot_times_loader.h" #include "chrome/browser/chromeos/boot_times_loader.h"
#include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/cros_library.h"
......
...@@ -6,14 +6,12 @@ ...@@ -6,14 +6,12 @@
#include "base/values.h" #include "base/values.h"
#include "base/test/mock_time_provider.h" #include "base/test/mock_time_provider.h"
#include "chrome/browser/browser_process_impl.h"
#include "chrome/browser/extensions/api/alarms/alarm_manager.h" #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
#include "chrome/browser/extensions/api/alarms/alarms_api.h" #include "chrome/browser/extensions/api/alarms/alarms_api.h"
#include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_function_test_utils.h"
#include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_manager.h"
#include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/browser_with_test_window_test.h"
#include "chrome/test/base/testing_browser_process.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include "base/json/json_writer.h" #include "base/json/json_writer.h"
#include "base/values.h" #include "base/values.h"
#include "chrome/browser/browser_process_impl.h"
#include "chrome/browser/extensions/api/discovery/discovery_api.h" #include "chrome/browser/extensions/api/discovery/discovery_api.h"
#include "chrome/browser/extensions/api/discovery/suggested_link.h" #include "chrome/browser/extensions/api/discovery/suggested_link.h"
#include "chrome/browser/extensions/api/discovery/suggested_links_registry.h" #include "chrome/browser/extensions/api/discovery/suggested_links_registry.h"
...@@ -16,7 +15,6 @@ ...@@ -16,7 +15,6 @@
#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/extensions/api/experimental_discovery.h" #include "chrome/common/extensions/api/experimental_discovery.h"
#include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/browser_with_test_window_test.h"
#include "chrome/test/base/testing_browser_process.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
namespace utils = extension_function_test_utils; namespace utils = extension_function_test_utils;
......
// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "base/string_util.h" #include "base/string_util.h"
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/browser_process_impl.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/platform_util.h" #include "chrome/browser/platform_util.h"
#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/prefs/scoped_user_pref_update.h"
...@@ -136,7 +136,7 @@ class ExternalDefaultProtocolObserver ...@@ -136,7 +136,7 @@ class ExternalDefaultProtocolObserver
bool prompt_user_; bool prompt_user_;
}; };
} // namespace } // namespace
// static // static
void ExternalProtocolHandler::PrepopulateDictionary(DictionaryValue* win_pref) { void ExternalProtocolHandler::PrepopulateDictionary(DictionaryValue* win_pref) {
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "base/stringprintf.h" #include "base/stringprintf.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "base/win/windows_version.h" #include "base/win/windows_version.h"
#include "chrome/browser/browser_process_impl.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h"
#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_list.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "base/json/json_reader.h" #include "base/json/json_reader.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "base/values.h" #include "base/values.h"
#include "chrome/browser/browser_process_impl.h"
#include "chrome/browser/debugger/devtools_window.h" #include "chrome/browser/debugger/devtools_window.h"
#include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service.h"
......
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/google/google_url_tracker.h"
#include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/infobars/infobar_tab_helper.h"
#include "chrome/browser/intents/device_attached_intent_source.h"
#include "chrome/browser/intents/register_intent_handler_infobar_delegate.h" #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h"
#include "chrome/browser/intents/web_intents_util.h" #include "chrome/browser/intents/web_intents_util.h"
#include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/lifetime/application_lifetime.h"
...@@ -351,7 +352,6 @@ Browser::Browser(const CreateParams& params) ...@@ -351,7 +352,6 @@ Browser::Browser(const CreateParams& params)
synced_window_delegate_( synced_window_delegate_(
new BrowserSyncedWindowDelegate(this))), new BrowserSyncedWindowDelegate(this))),
bookmark_bar_state_(BookmarkBar::HIDDEN), bookmark_bar_state_(BookmarkBar::HIDDEN),
device_attached_intent_source_(this, this),
ALLOW_THIS_IN_INITIALIZER_LIST( ALLOW_THIS_IN_INITIALIZER_LIST(
command_controller_(new chrome::BrowserCommandController(this))), command_controller_(new chrome::BrowserCommandController(this))),
window_has_shown_(false) { window_has_shown_(false) {
...@@ -396,6 +396,8 @@ Browser::Browser(const CreateParams& params) ...@@ -396,6 +396,8 @@ Browser::Browser(const CreateParams& params)
profile_->GetPrefs(), NULL); profile_->GetPrefs(), NULL);
instant_controller_.reset(new chrome::BrowserInstantController(this)); instant_controller_.reset(new chrome::BrowserInstantController(this));
device_attached_intent_source_.reset(
new DeviceAttachedIntentSource(this, (this)));
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_INIT); UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_INIT);
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "base/string16.h" #include "base/string16.h"
#include "chrome/browser/debugger/devtools_toggle_action.h" #include "chrome/browser/debugger/devtools_toggle_action.h"
#include "chrome/browser/event_disposition.h" #include "chrome/browser/event_disposition.h"
#include "chrome/browser/intents/device_attached_intent_source.h"
#include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/prefs/pref_change_registrar.h"
#include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_member.h"
#include "chrome/browser/sessions/session_id.h" #include "chrome/browser/sessions/session_id.h"
...@@ -49,6 +48,7 @@ class BrowserSyncedWindowDelegate; ...@@ -49,6 +48,7 @@ class BrowserSyncedWindowDelegate;
class BrowserToolbarModelDelegate; class BrowserToolbarModelDelegate;
class BrowserTabRestoreServiceDelegate; class BrowserTabRestoreServiceDelegate;
class BrowserWindow; class BrowserWindow;
class DeviceAttachedIntentSource;
class FindBarController; class FindBarController;
class FullscreenController; class FullscreenController;
class PrefService; class PrefService;
...@@ -896,7 +896,8 @@ class Browser : public TabStripModelObserver, ...@@ -896,7 +896,8 @@ class Browser : public TabStripModelObserver,
scoped_ptr<chrome::BrowserInstantController> instant_controller_; scoped_ptr<chrome::BrowserInstantController> instant_controller_;
BookmarkBar::State bookmark_bar_state_; BookmarkBar::State bookmark_bar_state_;
DeviceAttachedIntentSource device_attached_intent_source_;
scoped_ptr<DeviceAttachedIntentSource> device_attached_intent_source_;
scoped_refptr<FullscreenController> fullscreen_controller_; scoped_refptr<FullscreenController> fullscreen_controller_;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop.h"
#include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_commands.h"
...@@ -460,4 +461,3 @@ void ReloadButtonGtk::ClearCache() { ...@@ -460,4 +461,3 @@ void ReloadButtonGtk::ClearCache() {
if (browser_) if (browser_)
chrome::ClearCache(browser_); chrome::ClearCache(browser_);
} }
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "chrome/browser/ui/unload_controller.h" #include "chrome/browser/ui/unload_controller.h"
#include "base/message_loop.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/tab_contents.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment