summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 17:44:28 +0000
committersaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 17:44:28 +0000
commita189eb230939a522cd8e904519c4e2a1d97510f2 (patch)
treed48e8c77006600cc20c97a45766d06dcbe790390
parente42b0f132c86de281275bc8a53a38b391926c68d (diff)
downloadchromium_src-a189eb230939a522cd8e904519c4e2a1d97510f2.zip
chromium_src-a189eb230939a522cd8e904519c4e2a1d97510f2.tar.gz
chromium_src-a189eb230939a522cd8e904519c4e2a1d97510f2.tar.bz2
Remove dangling files and clean up gyp.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8763011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112480 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/background/background_mode_manager_factory.cc34
-rw-r--r--chrome/browser/background/background_mode_manager_factory.h35
-rw-r--r--chrome/browser/gpu_uitest.cc0
-rw-r--r--chrome/browser/ui/views/tab_contents/tab_contents_container_native.cc89
-rw-r--r--chrome/browser/ui/views/tab_contents/tab_contents_container_native.h94
-rw-r--r--chrome/chrome_browser.gypi4
-rw-r--r--chrome/chrome_tests.gypi2
7 files changed, 0 insertions, 258 deletions
diff --git a/chrome/browser/background/background_mode_manager_factory.cc b/chrome/browser/background/background_mode_manager_factory.cc
deleted file mode 100644
index 393a349..0000000
--- a/chrome/browser/background/background_mode_manager_factory.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/background/background_mode_manager_factory.h"
-
-#include "base/command_line.h"
-#include "chrome/browser/background/background_mode_manager.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_dependency_manager.h"
-
-// static
-BackgroundModeManager* BackgroundModeManagerFactory::GetForProfile(
- Profile* profile) {
- return static_cast<BackgroundModeManager*>(
- GetInstance()->GetServiceForProfile(profile, true));
-}
-
-// static
-BackgroundModeManagerFactory* BackgroundModeManagerFactory::GetInstance() {
- return Singleton<BackgroundModeManagerFactory>::get();
-}
-
-BackgroundModeManagerFactory::BackgroundModeManagerFactory()
- : ProfileKeyedServiceFactory(ProfileDependencyManager::GetInstance()) {
-}
-
-BackgroundModeManagerFactory::~BackgroundModeManagerFactory() {
-}
-
-ProfileKeyedService* BackgroundModeManagerFactory::BuildServiceInstanceFor(
- Profile* profile) const {
- return new BackgroundModeManager(profile, CommandLine::ForCurrentProcess());
-}
diff --git a/chrome/browser/background/background_mode_manager_factory.h b/chrome/browser/background/background_mode_manager_factory.h
deleted file mode 100644
index f4e31fa..0000000
--- a/chrome/browser/background/background_mode_manager_factory.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_FACTORY_H_
-#define CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_FACTORY_H_
-
-#include "base/compiler_specific.h"
-#include "base/memory/singleton.h"
-#include "chrome/browser/profiles/profile_keyed_service_factory.h"
-
-class BackgroundModeManager;
-class Profile;
-
-// Singleton that owns all BackgroundModeManagers and associates them with
-// Profiles. Listens for the Profile's destruction notification and cleans up
-// the associated BackgroundModeManager.
-class BackgroundModeManagerFactory : public ProfileKeyedServiceFactory {
- public:
- static BackgroundModeManager* GetForProfile(Profile* profile);
-
- static BackgroundModeManagerFactory* GetInstance();
-
- private:
- friend struct DefaultSingletonTraits<BackgroundModeManagerFactory>;
-
- BackgroundModeManagerFactory();
- virtual ~BackgroundModeManagerFactory();
-
- // ProfileKeyedServiceFactory:
- virtual ProfileKeyedService* BuildServiceInstanceFor(
- Profile* profile) const OVERRIDE;
-};
-
-#endif // CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_FACTORY_H_
diff --git a/chrome/browser/gpu_uitest.cc b/chrome/browser/gpu_uitest.cc
deleted file mode 100644
index e69de29..0000000
--- a/chrome/browser/gpu_uitest.cc
+++ /dev/null
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container_native.cc b/chrome/browser/ui/views/tab_contents/tab_contents_container_native.cc
deleted file mode 100644
index f5517aa..0000000
--- a/chrome/browser/ui/views/tab_contents/tab_contents_container_native.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
-
-#include "chrome/browser/ui/view_ids.h"
-#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"
-#include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/renderer_host/render_widget_host_view.h"
-#include "content/browser/tab_contents/interstitial_page.h"
-#include "content/browser/tab_contents/tab_contents.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
-
-// Some of this class is implemented in tab_contents_container.cc, where
-// the implementation doesn't vary between a pure views approach and a
-// native view host approach. See the header file for details.
-
-////////////////////////////////////////////////////////////////////////////////
-// TabContentsContainer, public:
-
-TabContentsContainer::TabContentsContainer()
- : native_container_(NULL),
- tab_contents_(NULL) {
- set_id(VIEW_ID_TAB_CONTAINER);
-}
-
-void TabContentsContainer::SetReservedContentsRect(
- const gfx::Rect& reserved_rect) {
- cached_reserved_rect_ = reserved_rect;
- if (tab_contents_ && tab_contents_->GetRenderWidgetHostView()) {
- tab_contents_->GetRenderWidgetHostView()->set_reserved_contents_rect(
- reserved_rect);
- }
-}
-
-void TabContentsContainer::ChangeTabContents(TabContents* contents) {
- if (tab_contents_) {
- native_container_->DetachContents(tab_contents_);
- tab_contents_->WasHidden();
- RemoveObservers();
- }
- tab_contents_ = contents;
- // When detaching the last tab of the browser ChangeTabContents is invoked
- // with NULL. Don't attempt to do anything in that case.
- if (tab_contents_) {
- RenderWidgetHostViewChanged(tab_contents_->GetRenderWidgetHostView());
- native_container_->AttachContents(tab_contents_);
- AddObservers();
- }
-}
-
-void TabContentsContainer::TabContentsFocused(TabContents* tab_contents) {
- native_container_->TabContentsFocused(tab_contents);
-}
-
-void TabContentsContainer::SetFastResize(bool fast_resize) {
- native_container_->SetFastResize(fast_resize);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// TabContentsContainer, View overrides:
-
-void TabContentsContainer::Layout() {
- if (native_container_) {
- native_container_->GetView()->SetBounds(0, 0, width(), height());
- native_container_->GetView()->Layout();
- }
-}
-
-void TabContentsContainer::ViewHierarchyChanged(bool is_add,
- views::View* parent,
- views::View* child) {
- if (is_add && child == this) {
- native_container_ = NativeTabContentsContainer::CreateNativeContainer(this);
- AddChildView(native_container_->GetView());
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// TabContentsContainer, private:
-
-void TabContentsContainer::RenderViewHostChanged(RenderViewHost* old_host,
- RenderViewHost* new_host) {
- if (new_host)
- RenderWidgetHostViewChanged(new_host->view());
- native_container_->RenderViewHostChanged(old_host, new_host);
-}
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h b/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h
deleted file mode 100644
index db48ab6..0000000
--- a/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_NATIVE_H_
-#define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_NATIVE_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "ui/views/view.h"
-
-class NativeTabContentsContainer;
-class RenderViewHost;
-class RenderWidgetHostView;
-class TabContents;
-
-class TabContentsContainer : public views::View,
- public content::NotificationObserver {
- public:
- TabContentsContainer();
- virtual ~TabContentsContainer();
-
- // Changes the TabContents associated with this view.
- void ChangeTabContents(TabContents* contents);
-
- View* GetFocusView() { return native_container_->GetView(); }
-
- // Accessor for |tab_contents_|.
- TabContents* tab_contents() const { return tab_contents_; }
-
- // Called by the BrowserView to notify that |tab_contents| got the focus.
- void TabContentsFocused(TabContents* tab_contents);
-
- // Tells the container to update less frequently during resizing operations
- // so performance is better.
- void SetFastResize(bool fast_resize);
-
- // Updates the current reserved rect in view coordinates where contents
- // should not be rendered to draw the resize corner, sidebar mini tabs etc.
- void SetReservedContentsRect(const gfx::Rect& reserved_rect);
-
- // Overridden from content::NotificationObserver:
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
-
- // Overridden from views::View:
- virtual void Layout() OVERRIDE;
- virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
-
- protected:
- // Overridden from views::View:
- virtual void ViewHierarchyChanged(bool is_add, views::View* parent,
- views::View* child) OVERRIDE;
-
- private:
- // Add or remove observers for events that we care about.
- void AddObservers();
- void RemoveObservers();
-
- // Called when the RenderViewHost of the hosted TabContents has changed, e.g.
- // to show an interstitial page.
- void RenderViewHostChanged(RenderViewHost* old_host,
- RenderViewHost* new_host);
-
- // Called when a TabContents is destroyed. This gives us a chance to clean
- // up our internal state if the TabContents is somehow destroyed before we
- // get notified.
- void TabContentsDestroyed(TabContents* contents);
-
- // Called when the RenderWidgetHostView of the hosted TabContents has changed.
- void RenderWidgetHostViewChanged(RenderWidgetHostView* new_view);
-
- // An instance of a NativeTabContentsContainer object that holds the native
- // view handle associated with the attached TabContents.
- NativeTabContentsContainer* native_container_;
-
- // The attached TabContents.
- TabContents* tab_contents_;
-
- // Handles registering for our notifications.
- content::NotificationRegistrar registrar_;
-
- // The current reserved rect in view coordinates where contents should not be
- // rendered to draw the resize corner, sidebar mini tabs etc.
- // Cached here to update ever changing renderers.
- gfx::Rect cached_reserved_rect_;
-
- DISALLOW_COPY_AND_ASSIGN(TabContentsContainer);
-};
-
-#endif // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_NATIVE_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 039e3ec..b1c1c4c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4030,9 +4030,6 @@
],
}],
['configuration_policy==0', {
- 'sources!': [
- 'browser/ui/webui/options/options_managed_banner_handler.cc',
- ],
'sources/': [
['exclude', '^browser/policy/'],
['include', '^browser/policy/policy_path_parser'],
@@ -4372,7 +4369,6 @@
['OS=="mac"', {
'sources!': [
'browser/automation/automation_provider_list_generic.cc',
- 'browser/bookmarks/bookmark_context_menu.cc',
'browser/bookmarks/bookmark_drop_info.cc',
'browser/first_run/upgrade_util.cc',
'browser/importer/nss_decryptor_system_nss.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 55ac654..52bc394 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -590,7 +590,6 @@
'browser/ui/views/menu_item_view_test.cc',
'browser/ui/views/menu_model_adapter_test.cc',
'browser/ui/views/tabs/tab_dragging_test.cc',
- 'browser/ui/views/tabs/tab_strip_interactive_uitest.cc',
'test/base/view_event_test_base.cc',
'test/base/view_event_test_base.h',
],
@@ -619,7 +618,6 @@
'browser/ui/views/menu_item_view_test.cc',
'browser/ui/views/menu_model_adapter_test.cc',
'browser/ui/views/tabs/tab_dragging_test.cc',
- 'browser/ui/views/tabs/tab_strip_interactive_uitest.cc',
'test/base/view_event_test_base.cc',
'test/base/view_event_test_base.h',
],