summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/extension_browsertest.cc2
-rw-r--r--chrome/browser/extensions/extension_host.h2
-rw-r--r--chrome/browser/extensions/extension_message_service.cc1
-rw-r--r--chrome/browser/views/bookmark_bar_view.cc3
-rw-r--r--chrome/browser/views/extensions/extension_shelf.cc (renamed from chrome/browser/extensions/extension_shelf.cc)4
-rw-r--r--chrome/browser/views/extensions/extension_shelf.h (renamed from chrome/browser/extensions/extension_shelf.h)7
-rw-r--r--chrome/browser/views/extensions/extension_view.cc (renamed from chrome/browser/extensions/extension_view.cc)2
-rw-r--r--chrome/browser/views/extensions/extension_view.h (renamed from chrome/browser/extensions/extension_view.h)6
-rw-r--r--chrome/chrome.gyp25
9 files changed, 23 insertions, 29 deletions
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 4008828..5980d8d 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -6,13 +6,13 @@
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/extensions/extension_shelf.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_process_manager.h"
#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/extensions/test_extension_loader.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/views/extensions/extension_shelf.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension_error_reporter.h"
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 72cde94..51e0ab5 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -11,7 +11,7 @@
#include "chrome/browser/renderer_host/render_view_host_delegate.h"
#include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
#if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/extensions/extension_view.h"
+#include "chrome/browser/views/extensions/extension_view.h"
#endif
class Browser;
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index 33fbcf2..c7d7a50 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/child_process_security_policy.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/extensions/extension_tabs_module.h"
-#include "chrome/browser/extensions/extension_view.h"
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/renderer_host/resource_message_filter.h"
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index d26165c1..adbd864 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -16,8 +16,6 @@
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_theme_provider.h"
-#include "chrome/browser/extensions/extension_view.h"
-#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/renderer_host/render_view_host.h"
@@ -28,7 +26,6 @@
#include "chrome/browser/views/event_utils.h"
#include "chrome/browser/views/frame/browser_view.h"
#include "chrome/browser/views/location_bar_view.h"
-#include "chrome/common/extensions/extension.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/page_transition_types.h"
#include "chrome/common/pref_names.h"
diff --git a/chrome/browser/extensions/extension_shelf.cc b/chrome/browser/views/extensions/extension_shelf.cc
index 1d4eac3..19e15b4 100644
--- a/chrome/browser/extensions/extension_shelf.cc
+++ b/chrome/browser/views/extensions/extension_shelf.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/extension_shelf.h"
+#include "chrome/browser/views/extensions/extension_shelf.h"
#include <algorithm>
@@ -13,9 +13,9 @@
#include "chrome/browser/browser.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_process_manager.h"
-#include "chrome/browser/extensions/extension_view.h"
#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/profile.h"
+#include "chrome/browser/views/extensions/extension_view.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/notification_service.h"
#include "skia/ext/skia_utils.h"
diff --git a/chrome/browser/extensions/extension_shelf.h b/chrome/browser/views/extensions/extension_shelf.h
index ddef2ed..a4baaec2 100644
--- a/chrome/browser/extensions/extension_shelf.h
+++ b/chrome/browser/views/extensions/extension_shelf.h
@@ -2,13 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SHELF_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_SHELF_H_
+#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_SHELF_H_
+#define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_SHELF_H_
#include "app/gfx/canvas.h"
#include "base/task.h"
#include "chrome/browser/extensions/extension_shelf_model.h"
-#include "chrome/browser/extensions/extension_view.h"
#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/views/browser_bubble.h"
#include "views/view.h"
@@ -115,4 +114,4 @@ class ExtensionShelf : public views::View,
DISALLOW_COPY_AND_ASSIGN(ExtensionShelf);
};
-#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SHELF_H_
+#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_SHELF_H_
diff --git a/chrome/browser/extensions/extension_view.cc b/chrome/browser/views/extensions/extension_view.cc
index ce0a125..2050aa0 100644
--- a/chrome/browser/extensions/extension_view.cc
+++ b/chrome/browser/views/extensions/extension_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/extension_view.h"
+#include "chrome/browser/views/extensions/extension_view.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/extensions/extension_view.h b/chrome/browser/views/extensions/extension_view.h
index 22ca804..de34aa5 100644
--- a/chrome/browser/extensions/extension_view.h
+++ b/chrome/browser/views/extensions/extension_view.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_H_
+#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_
+#define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_
#include "build/build_config.h"
@@ -106,4 +106,4 @@ class ExtensionView : public views::NativeViewHost {
DISALLOW_COPY_AND_ASSIGN(ExtensionView);
};
-#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_H_
+#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 1aecfe4..89c6006 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -892,16 +892,12 @@
'browser/extensions/extension_process_manager.h',
'browser/extensions/extension_protocols.cc',
'browser/extensions/extension_protocols.h',
- 'browser/extensions/extension_shelf.cc',
- 'browser/extensions/extension_shelf.h',
'browser/extensions/extension_shelf_model.cc',
'browser/extensions/extension_shelf_model.h',
'browser/extensions/extension_tabs_module.cc',
'browser/extensions/extension_tabs_module.h',
'browser/extensions/extension_tabs_module_constants.cc',
'browser/extensions/extension_tabs_module_constants.h',
- 'browser/extensions/extension_view.cc',
- 'browser/extensions/extension_view.h',
'browser/extensions/extensions_service.cc',
'browser/extensions/extensions_service.h',
'browser/extensions/extensions_ui.cc',
@@ -1512,6 +1508,10 @@
'browser/views/edit_search_engine_dialog.h',
'browser/views/event_utils.cc',
'browser/views/event_utils.h',
+ 'browser/views/extensions/extension_shelf.cc',
+ 'browser/views/extensions/extension_shelf.h',
+ 'browser/views/extensions/extension_view.cc',
+ 'browser/views/extensions/extension_view.h',
'browser/views/external_protocol_dialog.cc',
'browser/views/external_protocol_dialog.h',
'browser/views/find_bar_view.cc',
@@ -1717,10 +1717,10 @@
'../build/linux/system.gyp:nss',
],
'sources!': [
- 'browser/extensions/extension_shelf.cc',
- 'browser/extensions/extension_shelf.h',
- 'browser/extensions/extension_view.cc',
- 'browser/extensions/extension_view.h',
+ 'browser/views/extensions/extension_shelf.cc',
+ 'browser/views/extensions/extension_shelf.h',
+ 'browser/views/extensions/extension_view.cc',
+ 'browser/views/extensions/extension_view.h',
# Windows-specific files.
'browser/password_manager/password_store_win.cc',
'browser/password_manager/password_store_win.h',
@@ -1774,10 +1774,10 @@
'browser/password_manager/password_store_kwallet.cc',
'browser/password_manager/password_store_win.cc',
'browser/password_manager/password_store_win.h',
- 'browser/extensions/extension_shelf.cc',
- 'browser/extensions/extension_shelf.h',
- 'browser/extensions/extension_view.cc',
- 'browser/extensions/extension_view.h',
+ 'browser/views/extensions/extension_shelf.cc',
+ 'browser/views/extensions/extension_shelf.h',
+ 'browser/views/extensions/extension_view.cc',
+ 'browser/views/extensions/extension_view.h',
],
'sources': [
# Build the necessary GTM sources
@@ -2014,7 +2014,6 @@
'browser/bookmarks/bookmark_menu_controller.h',
'browser/browser_accessibility.cc',
'browser/browser_accessibility_manager.cc',
- 'browser/extensions/extension_shelf.cc',
'browser/extensions/extension_creator.cc',
'browser/dom_ui/html_dialog_contents.cc',
'browser/encoding_menu_controller_delegate.cc',
generated by cgit v1.1 at 2025-01-22 11:33:23 +0000