diff options
31 files changed, 36 insertions, 954 deletions
diff --git a/build/all.gyp b/build/all.gyp index 634a977..b890f2c 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -103,6 +103,7 @@ ['OS!="ios" and OS!="android"', { 'dependencies': [ '../third_party/re2/re2.gyp:re2', + '../chrome/chrome.gyp:*', '../chrome/tools/profile_reset/jtl_compiler.gyp:*', '../cc/blink/cc_blink_tests.gyp:*', '../cc/cc_tests.gyp:*', @@ -147,21 +148,6 @@ '../v8/tools/gyp/v8.gyp:*', '<(libjpeg_gyp_path):*', ], - 'conditions': [ - ['use_athena==1' , { - 'dependencies': [ - # Athena temporarily depends upon a subset of chrome. Since most - # tests do not compile, we only include dependencies to tests we - # want to build. - '../chrome/chrome.gyp:chrome', - '../chrome/chrome.gyp:browser_tests', - ] - }, { - 'dependencies': [ - '../chrome/chrome.gyp:*', - ], - }], - ], }], ['use_openssl==0 and (OS=="mac" or OS=="ios" or OS=="win")', { 'dependencies': [ @@ -328,6 +314,9 @@ '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:chromedriver_tests', '../chrome/chrome.gyp:chromedriver_unittests', + '../chrome/chrome.gyp:interactive_ui_tests', + '../chrome/chrome.gyp:sync_integration_tests', + '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_shell', @@ -353,15 +342,6 @@ '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../tools/telemetry/telemetry.gyp:*', ], - 'conditions': [ - ['use_athena!=1', { - 'dependencies' : [ - '../chrome/chrome.gyp:interactive_ui_tests', - '../chrome/chrome.gyp:sync_integration_tests', - '../chrome/chrome.gyp:unit_tests', - ], - }], - ], }], ['OS=="win"', { 'dependencies': [ @@ -1274,6 +1254,8 @@ '../cc/cc_tests.gyp:cc_unittests', '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:chrome', + '../chrome/chrome.gyp:interactive_ui_tests', + '../chrome/chrome.gyp:unit_tests', '../components/components_tests.gyp:components_unittests', '../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_unittests', @@ -1300,12 +1282,6 @@ 'blink_tests', ], 'conditions': [ - ['use_athena!=1', { - 'dependencies': [ - '../chrome/chrome.gyp:interactive_ui_tests', - '../chrome/chrome.gyp:unit_tests', - ], - }], ['OS=="win"', { 'dependencies': [ '../chrome/chrome.gyp:crash_service', @@ -1370,19 +1346,13 @@ 'dependencies': [ '../base/base.gyp:base_unittests_run', '../chrome/chrome.gyp:browser_tests_run', + '../chrome/chrome.gyp:interactive_ui_tests_run', + '../chrome/chrome.gyp:sync_integration_tests_run', + '../chrome/chrome.gyp:unit_tests_run', '../content/content_shell_and_tests.gyp:content_browsertests_run', '../content/content_shell_and_tests.gyp:content_unittests_run', '../net/net.gyp:net_unittests_run', ], - 'conditions' : [ - ['use_athena!=1', { - 'dependencies': [ - '../chrome/chrome.gyp:interactive_ui_tests_run', - '../chrome/chrome.gyp:sync_integration_tests_run', - '../chrome/chrome.gyp:unit_tests_run', - ], - }], - ], }, # target_name: chromium_swarm_tests ], }], diff --git a/build/common.gypi b/build/common.gypi index 69b0984..6f78f00 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1199,9 +1199,6 @@ 'support_pre_M6_history_database%': '<(support_pre_M6_history_database)', 'v8_use_external_startup_data%': '<(v8_use_external_startup_data)', - # Whether or not we are building the Athena shell. - 'use_athena%': '0', - # Use system protobuf instead of bundled one. 'use_system_protobuf%': 0, diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn index f32797c..c57ba3f 100644 --- a/build/config/BUILD.gn +++ b/build/config/BUILD.gn @@ -196,9 +196,6 @@ config("feature_flags") { if (enable_one_click_signin) { defines += [ "ENABLE_ONE_CLICK_SIGNIN" ] } - if (use_athena) { - defines += [ "USE_ATHENA=1" ] - } if (enable_hidpi) { defines += [ "ENABLE_HIDPI=1" ] } diff --git a/build/config/ui.gni b/build/config/ui.gni index 72303ac..46154a3 100644 --- a/build/config/ui.gni +++ b/build/config/ui.gni @@ -59,6 +59,4 @@ use_ozone_evdev = use_ozone use_clipboard_aurax11 = is_linux && use_aura && use_x11 -use_athena = false - enable_hidpi = is_mac || is_chromeos || is_win diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index c6255f3..c9d20a9 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -485,10 +485,6 @@ template("chrome_repack_percent") { [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ] deps += [ "//ash/resources" ] } - if (use_athena) { - sources += [ "$root_gen_dir/athena/resources/athena_resources_${percent}_percent.pak" ] - deps += [ "//athena/resources" ] - } if (is_chromeos) { sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak" ] deps += [ "//ui/chromeos/resources" ] diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index 5625d79..9e717f0 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -110,17 +110,6 @@ static_library("extensions") { "api/tabs/ash_panel_contents.h", ] } - if (use_athena) { - defines += [ USE_ATHENA ] - sources += rebase_path(gypi_values.chrome_browser_extensions_athena_sources, - ".", - "//chrome") - } else { - sources += - rebase_path(gypi_values.chrome_browser_extensions_non_athena_sources, - ".", - "//chrome") - } if (is_linux) { configs += [ "//build/config/linux:fontconfig" ] diff --git a/chrome/browser/extensions/api/tabs/tabs_api_athena.cc b/chrome/browser/extensions/api/tabs/tabs_api_athena.cc deleted file mode 100644 index bab8f24..0000000 --- a/chrome/browser/extensions/api/tabs/tabs_api_athena.cc +++ /dev/null @@ -1,360 +0,0 @@ -// Copyright 2014 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/extensions/api/tabs/tabs_api.h" - -#include <string> -#include <vector> - -#include "base/logging.h" -#include "chrome/browser/extensions/api/tabs/tabs_constants.h" - -using content::WebContents; - -namespace extensions { - -namespace windows = api::windows; -namespace keys = tabs_constants; -namespace tabs = api::tabs; - -void ZoomModeToZoomSettings(ZoomController::ZoomMode zoom_mode, - api::tabs::ZoomSettings* zoom_settings) { - DCHECK(zoom_settings); - NOTIMPLEMENTED(); -} - -// Windows --------------------------------------------------------------------- - -bool WindowsGetFunction::RunSync() { - scoped_ptr<windows::Get::Params> params(windows::Get::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool WindowsGetCurrentFunction::RunSync() { - scoped_ptr<windows::GetCurrent::Params> params( - windows::GetCurrent::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool WindowsGetLastFocusedFunction::RunSync() { - scoped_ptr<windows::GetLastFocused::Params> params( - windows::GetLastFocused::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool WindowsGetAllFunction::RunSync() { - scoped_ptr<windows::GetAll::Params> params( - windows::GetAll::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool WindowsCreateFunction::ShouldOpenIncognitoWindow( - const windows::Create::Params::CreateData* create_data, - std::vector<GURL>* urls, bool* is_error) { - error_ = keys::kIncognitoModeIsDisabled; - *is_error = true; - NOTIMPLEMENTED(); - return false; -} - -bool WindowsCreateFunction::RunSync() { - scoped_ptr<windows::Create::Params> params( - windows::Create::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params); - NOTIMPLEMENTED(); - return false; -} - -bool WindowsUpdateFunction::RunSync() { - scoped_ptr<windows::Update::Params> params( - windows::Update::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params); - NOTIMPLEMENTED(); - return false; -} - -bool WindowsRemoveFunction::RunSync() { - scoped_ptr<windows::Remove::Params> params( - windows::Remove::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params); - NOTIMPLEMENTED(); - return false; -} - -// Tabs ------------------------------------------------------------------------ - -bool TabsGetSelectedFunction::RunSync() { - scoped_ptr<windows::Remove::Params> params( - windows::Remove::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsGetAllInWindowFunction::RunSync() { - scoped_ptr<tabs::GetAllInWindow::Params> params( - tabs::GetAllInWindow::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsQueryFunction::RunSync() { - scoped_ptr<tabs::Query::Params> params(tabs::Query::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsCreateFunction::RunSync() { - scoped_ptr<tabs::Create::Params> params(tabs::Create::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsDuplicateFunction::RunSync() { - scoped_ptr<tabs::Duplicate::Params> params( - tabs::Duplicate::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsGetFunction::RunSync() { - scoped_ptr<tabs::Get::Params> params(tabs::Get::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsGetCurrentFunction::RunSync() { - DCHECK(dispatcher()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsHighlightFunction::RunSync() { - scoped_ptr<tabs::Highlight::Params> params( - tabs::Highlight::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsHighlightFunction::HighlightTab(TabStripModel* tabstrip, - ui::ListSelectionModel* selection, - int* active_index, - int index) { - NOTREACHED(); - return false; -} - -TabsUpdateFunction::TabsUpdateFunction() : web_contents_(NULL) { -} - -bool TabsUpdateFunction::RunAsync() { - scoped_ptr<tabs::Update::Params> params(tabs::Update::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsUpdateFunction::UpdateURL(const std::string &url_string, - int tab_id, - bool* is_async) { - NOTREACHED(); - return false; -} - -void TabsUpdateFunction::PopulateResult() { - NOTREACHED(); -} - -void TabsUpdateFunction::OnExecuteCodeFinished( - const std::string& error, - const GURL& url, - const base::ListValue& script_result) { - NOTREACHED(); -} - -bool TabsMoveFunction::RunSync() { - scoped_ptr<tabs::Move::Params> params(tabs::Move::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsMoveFunction::MoveTab(int tab_id, - int* new_index, - int iteration, - base::ListValue* tab_values, - int* window_id) { - NOTREACHED(); - return false; -} - -bool TabsReloadFunction::RunSync() { - scoped_ptr<tabs::Reload::Params> params( - tabs::Reload::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsRemoveFunction::RunSync() { - scoped_ptr<tabs::Remove::Params> params(tabs::Remove::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -bool TabsRemoveFunction::RemoveTab(int tab_id) { - NOTREACHED(); - return false; -} - -TabsCaptureVisibleTabFunction::TabsCaptureVisibleTabFunction() - : chrome_details_(this) { -} - -bool TabsCaptureVisibleTabFunction::IsScreenshotEnabled() { - NOTREACHED(); - return false; -} - -WebContents* TabsCaptureVisibleTabFunction::GetWebContentsForID(int window_id) { - NOTREACHED(); - return NULL; -} - -void TabsCaptureVisibleTabFunction::OnCaptureFailure(FailureReason reason) { - NOTREACHED(); -} - -void TabsCaptureVisibleTabFunction::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { - NOTIMPLEMENTED(); -} - -bool TabsDetectLanguageFunction::RunAsync() { - scoped_ptr<tabs::DetectLanguage::Params> params( - tabs::DetectLanguage::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - NOTIMPLEMENTED(); - return false; -} - -void TabsDetectLanguageFunction::Observe( - int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) { - NOTREACHED(); -} - -void TabsDetectLanguageFunction::GotLanguage(const std::string& language) { - NOTREACHED(); -} - -ExecuteCodeInTabFunction::ExecuteCodeInTabFunction() - : chrome_details_(this), execute_tab_id_(-1) { - (void) execute_tab_id_; -} - -ExecuteCodeInTabFunction::~ExecuteCodeInTabFunction() {} - -bool ExecuteCodeInTabFunction::HasPermission() { - NOTREACHED(); - return false; -} - -bool ExecuteCodeInTabFunction::Init() { - NOTREACHED(); - return false; -} - -bool ExecuteCodeInTabFunction::CanExecuteScriptOnPage() { - NOTREACHED(); - return false; -} - -ScriptExecutor* ExecuteCodeInTabFunction::GetScriptExecutor() { - NOTREACHED(); - return NULL; -} - -bool ExecuteCodeInTabFunction::IsWebView() const { - NOTREACHED(); - return false; -} - -const GURL& ExecuteCodeInTabFunction::GetWebViewSrc() const { - NOTREACHED(); - return GURL::EmptyGURL(); -} - -bool TabsExecuteScriptFunction::ShouldInsertCSS() const { - NOTREACHED(); - return false; -} - -void TabsExecuteScriptFunction::OnExecuteCodeFinished( - const std::string& error, - const GURL& on_url, - const base::ListValue& result) { - NOTREACHED(); -} - -bool TabsInsertCSSFunction::ShouldInsertCSS() const { - NOTREACHED(); - return true; -} - -content::WebContents* ZoomAPIFunction::GetWebContents(int tab_id) { - NOTREACHED(); - return NULL; -} - -bool TabsSetZoomFunction::RunAsync() { - scoped_ptr<tabs::SetZoom::Params> params( - tabs::SetZoom::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params); - NOTIMPLEMENTED(); - return false; -} - -bool TabsGetZoomFunction::RunAsync() { - scoped_ptr<tabs::GetZoom::Params> params( - tabs::GetZoom::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params); - NOTIMPLEMENTED(); - return false; -} - -bool TabsSetZoomSettingsFunction::RunAsync() { - using api::tabs::ZoomSettings; - scoped_ptr<tabs::SetZoomSettings::Params> params( - tabs::SetZoomSettings::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params); - NOTIMPLEMENTED(); - return false; -} - -bool TabsGetZoomSettingsFunction::RunAsync() { - scoped_ptr<tabs::GetZoomSettings::Params> params( - tabs::GetZoomSettings::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params); - NOTIMPLEMENTED(); - return false; -} - -} // namespace extensions diff --git a/chrome/browser/extensions/display_info_provider_athena.cc b/chrome/browser/extensions/display_info_provider_athena.cc deleted file mode 100644 index 8ac6e27..0000000 --- a/chrome/browser/extensions/display_info_provider_athena.cc +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2014 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/extensions/display_info_provider_athena.h" - -namespace extensions { - -DisplayInfoProviderAthena::DisplayInfoProviderAthena() { -} - -DisplayInfoProviderAthena::~DisplayInfoProviderAthena() { -} - -bool DisplayInfoProviderAthena::SetInfo( - const std::string& display_id_str, - const core_api::system_display::DisplayProperties& info, - std::string* error) { - *error = "Not implemented"; - return false; -} - -void DisplayInfoProviderAthena::UpdateDisplayUnitInfoForPlatform( - const gfx::Display& display, - extensions::core_api::system_display::DisplayUnitInfo* unit) { - static bool logged_once = false; - if (!logged_once) { - NOTIMPLEMENTED(); - logged_once = true; - } -} - -gfx::Screen* DisplayInfoProviderAthena::GetActiveScreen() { - NOTIMPLEMENTED(); - return NULL; -} - -// static -DisplayInfoProvider* DisplayInfoProvider::Create() { - return new DisplayInfoProviderAthena(); -} - -} // namespace extensions diff --git a/chrome/browser/extensions/display_info_provider_athena.h b/chrome/browser/extensions/display_info_provider_athena.h deleted file mode 100644 index 1269920..0000000 --- a/chrome/browser/extensions/display_info_provider_athena.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2014 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_EXTENSIONS_DISPLAY_INFO_PROVIDER_ATHENA_H_ -#define CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_ATHENA_H_ - -#include "extensions/browser/api/system_display/display_info_provider.h" - -namespace extensions { - -// TODO: Merge into DisplayInfoProviderChromeOS once DisplayManager is -// refactored. crbug.com/416961 -class DisplayInfoProviderAthena : public DisplayInfoProvider { - public: - DisplayInfoProviderAthena(); - virtual ~DisplayInfoProviderAthena(); - - // DisplayInfoProvider implementation. - virtual bool SetInfo(const std::string& display_id, - const core_api::system_display::DisplayProperties& info, - std::string* error) override; - virtual void UpdateDisplayUnitInfoForPlatform( - const gfx::Display& display, - core_api::system_display::DisplayUnitInfo* unit) override; - virtual gfx::Screen* GetActiveScreen() override; - - private: - DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderAthena); -}; - -} // namespace extensions - -#endif // CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_ATHENA_H_ diff --git a/chrome/browser/extensions/extension_tab_util_athena.cc b/chrome/browser/extensions/extension_tab_util_athena.cc deleted file mode 100644 index 02dd4c6..0000000 --- a/chrome/browser/extensions/extension_tab_util_athena.cc +++ /dev/null @@ -1,234 +0,0 @@ -// Copyright (c) 2012 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/extensions/extension_tab_util.h" - -#include "base/logging.h" -#include "base/values.h" -#include "chrome/browser/extensions/api/tabs/tabs_constants.h" -#include "chrome/browser/extensions/window_controller.h" -#include "chrome/browser/extensions/window_controller_list.h" -#include "chrome/browser/sessions/session_tab_helper.h" -#include "content/public/browser/browser_context.h" -#include "content/public/browser/favicon_status.h" -#include "content/public/browser/navigation_entry.h" -#include "extensions/browser/app_window/app_window.h" -#include "extensions/browser/app_window/app_window_registry.h" -#include "url/gurl.h" - -using content::NavigationEntry; -using content::WebContents; - -namespace extensions { - -namespace keys = tabs_constants; - -namespace { - -WindowController* GetAppWindowController(const WebContents* contents) { - AppWindowRegistry* registry = - AppWindowRegistry::Get(contents->GetBrowserContext()); - if (!registry) - return NULL; - AppWindow* app_window = - registry->GetAppWindowForRenderViewHost(contents->GetRenderViewHost()); - if (!app_window) - return NULL; - return WindowControllerList::GetInstance()->FindWindowById( - app_window->session_id().id()); -} - -} // namespace - -ExtensionTabUtil::OpenTabParams::OpenTabParams() - : create_browser_if_needed(false) { -} - -ExtensionTabUtil::OpenTabParams::~OpenTabParams() { -} - -// Opens a new tab for a given extension. Returns NULL and sets |error| if an -// error occurs. -base::DictionaryValue* ExtensionTabUtil::OpenTab( - ChromeUIThreadExtensionFunction* function, - const OpenTabParams& params, - std::string* error) { - NOTIMPLEMENTED(); - return NULL; -} - -Browser* ExtensionTabUtil::GetBrowserFromWindowID( - ChromeUIThreadExtensionFunction* function, - int window_id, - std::string* error) { - NOTREACHED(); - return NULL; -} - -Browser* ExtensionTabUtil::GetBrowserFromWindowID( - const ChromeExtensionFunctionDetails& details, - int window_id, - std::string* error) { - NOTREACHED(); - return NULL; -} - -int ExtensionTabUtil::GetWindowId(const Browser* browser) { - NOTREACHED(); - return -1; -} - -int ExtensionTabUtil::GetWindowIdOfTabStripModel( - const TabStripModel* tab_strip_model) { - NOTREACHED(); - return -1; -} - -int ExtensionTabUtil::GetTabId(const WebContents* web_contents) { - return SessionTabHelper::IdForTab(web_contents); -} - -std::string ExtensionTabUtil::GetTabStatusText(bool is_loading) { - return is_loading ? keys::kStatusValueLoading : keys::kStatusValueComplete; -} - -int ExtensionTabUtil::GetWindowIdOfTab(const WebContents* web_contents) { - return SessionTabHelper::IdForWindowContainingTab(web_contents); -} - -base::DictionaryValue* ExtensionTabUtil::CreateTabValue( - WebContents* contents, - TabStripModel* tab_strip, - int tab_index, - const Extension* extension) { - NOTREACHED(); - return NULL; -} - -base::ListValue* ExtensionTabUtil::CreateTabList( - const Browser* browser, - const Extension* extension) { - return new base::ListValue(); -} - -base::DictionaryValue* ExtensionTabUtil::CreateTabValue( - WebContents* contents, - TabStripModel* tab_strip, - int tab_index) { - // There's no TabStrip in Athena. - DCHECK(!tab_strip); - - // If we have a matching AppWindow with a controller, get the tab value - // from its controller instead. - WindowController* controller = GetAppWindowController(contents); - if (controller) - return controller->CreateTabValue(NULL, tab_index); - - base::DictionaryValue* result = new base::DictionaryValue(); - bool is_loading = contents->IsLoading(); - result->SetInteger(keys::kIdKey, GetTabId(contents)); - result->SetInteger(keys::kIndexKey, tab_index); - result->SetInteger(keys::kWindowIdKey, GetWindowIdOfTab(contents)); - result->SetString(keys::kStatusKey, GetTabStatusText(is_loading)); - result->SetBoolean(keys::kActiveKey, false); - result->SetBoolean(keys::kSelectedKey, false); - result->SetBoolean(keys::kHighlightedKey, false); - result->SetBoolean(keys::kPinnedKey, false); - result->SetBoolean(keys::kIncognitoKey, - contents->GetBrowserContext()->IsOffTheRecord()); - result->SetInteger(keys::kWidthKey, - contents->GetContainerBounds().size().width()); - result->SetInteger(keys::kHeightKey, - contents->GetContainerBounds().size().height()); - - // Privacy-sensitive fields: these should be stripped off by - // ScrubTabValueForExtension if the extension should not see them. - result->SetString(keys::kUrlKey, contents->GetURL().spec()); - result->SetString(keys::kTitleKey, contents->GetTitle()); - if (!is_loading) { - NavigationEntry* entry = contents->GetController().GetVisibleEntry(); - if (entry && entry->GetFavicon().valid) - result->SetString(keys::kFaviconUrlKey, entry->GetFavicon().url.spec()); - } - - return result; -} - -void ExtensionTabUtil::ScrubTabValueForExtension( - WebContents* contents, - const Extension* extension, - base::DictionaryValue* tab_info) { - // TODO(oshima): Move this to common impl. -} - -void ExtensionTabUtil::ScrubTabForExtension(const Extension* extension, - api::tabs::Tab* tab) { - - // TODO(oshima): Move this to common impl. -} - -bool ExtensionTabUtil::GetTabStripModel(const WebContents* web_contents, - TabStripModel** tab_strip_model, - int* tab_index) { - NOTIMPLEMENTED(); - - return false; -} - -bool ExtensionTabUtil::GetDefaultTab(Browser* browser, - WebContents** contents, - int* tab_id) { - NOTIMPLEMENTED(); - return false; -} - -bool ExtensionTabUtil::GetTabById(int tab_id, - content::BrowserContext* browser_context, - bool include_incognito, - Browser** browser, - TabStripModel** tab_strip, - WebContents** contents, - int* tab_index) { - NOTIMPLEMENTED(); - return false; -} - -GURL ExtensionTabUtil::ResolvePossiblyRelativeURL(const std::string& url_string, - const Extension* extension) { - // TODO(oshima): Move this to common impl. - return GURL(url_string); -} - -bool ExtensionTabUtil::IsCrashURL(const GURL& url) { - // TODO(oshima): Move this to common impl. - return false; -} - -void ExtensionTabUtil::CreateTab(WebContents* web_contents, - const std::string& extension_id, - WindowOpenDisposition disposition, - const gfx::Rect& initial_pos, - bool user_gesture) { - NOTIMPLEMENTED(); -} - -// static -void ExtensionTabUtil::ForEachTab( - const base::Callback<void(WebContents*)>& callback) { - // TODO(oshima): Move this to common impl. -} - -// static -WindowController* ExtensionTabUtil::GetWindowControllerOfTab( - const WebContents* web_contents) { - NOTIMPLEMENTED(); - return NULL; -} - -void ExtensionTabUtil::OpenOptionsPage(const Extension* extension, - Browser* browser) { - NOTIMPLEMENTED(); -} - -} // namespace extensions diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index a1173ae..0ab3e15 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -225,24 +225,6 @@ static_library("ui") { ".", "//chrome") } - if (use_athena) { - sources += rebase_path(gypi_values.chrome_browser_ui_athena_sources, - ".", - "//chrome") - } else { # Not athena. - if (!is_android) { - sources += rebase_path( - gypi_values.chrome_browser_ui_non_athena_non_mobile_sources, - ".", - "//chrome") - } - if (use_ash) { - sources += - rebase_path(gypi_values.chrome_browser_ui_ash_non_athena_sources, - ".", - "//chrome") - } - } if (toolkit_views) { sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, ".", diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc index 5608e82..3b72621 100644 --- a/chrome/browser/ui/ash/ash_util.cc +++ b/chrome/browser/ui/ash/ash_util.cc @@ -27,8 +27,8 @@ bool ShouldOpenAshOnStartup() { bool IsNativeViewInAsh(gfx::NativeView native_view) { #if defined(OS_CHROMEOS) - // Optimization. There is only ash or only athena on ChromeOS. - return ash::Shell::HasInstance(); + // Optimization. There is only ash on ChromeOS. + return true; #endif if (!ash::Shell::HasInstance()) diff --git a/chrome/browser/ui/athena/extensions/DEPS b/chrome/browser/ui/athena/extensions/DEPS deleted file mode 100644 index 84a0082..0000000 --- a/chrome/browser/ui/athena/extensions/DEPS +++ /dev/null @@ -1,4 +0,0 @@ -include_rules = [ - "+athena/activity/public", - "+athena/extensions/public", -] diff --git a/chrome/browser/ui/athena/extensions/extension_install_ui_factory_athena.cc b/chrome/browser/ui/athena/extensions/extension_install_ui_factory_athena.cc deleted file mode 100644 index ec87d4f..0000000 --- a/chrome/browser/ui/athena/extensions/extension_install_ui_factory_athena.cc +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2014 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/extensions/extension_install_ui_factory.h" - -#include "athena/extensions/public/extensions_delegate.h" -#include "extensions/browser/install/extension_install_ui.h" - -namespace extensions { - -scoped_ptr<ExtensionInstallUI> CreateExtensionInstallUI( - content::BrowserContext* context) { - return athena::ExtensionsDelegate::Get(context)->CreateExtensionInstallUI(); -} - -} // namespace extensions diff --git a/chrome/browser/ui/views/athena/DEPS b/chrome/browser/ui/views/athena/DEPS deleted file mode 100644 index 0abd100..0000000 --- a/chrome/browser/ui/views/athena/DEPS +++ /dev/null @@ -1,6 +0,0 @@ -include_rules = [ - "+athena/activity/public", - "+athena/env/public", - "+athena/main/public", - "+athena/wm/public", -] diff --git a/chrome/browser/ui/views/athena/OWNERS b/chrome/browser/ui/views/athena/OWNERS deleted file mode 100644 index f30cc6f..0000000 --- a/chrome/browser/ui/views/athena/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -abodenha@chromium.org -mukai@chromium.org -oshima@chromium.org -skuhne@chromium.org diff --git a/chrome/browser/ui/views/athena/athena_util.cc b/chrome/browser/ui/views/athena/athena_util.cc deleted file mode 100644 index 145524e..0000000 --- a/chrome/browser/ui/views/athena/athena_util.cc +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2014 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/athena/athena_util.h" - -#include "athena/activity/public/activity.h" -#include "athena/activity/public/activity_manager.h" -#include "athena/wm/public/window_list_provider.h" -#include "athena/wm/public/window_manager.h" - -content::WebContents* GetWebContentsForWindow(aura::Window* owner_window) { - if (!owner_window) { - athena::WindowListProvider* window_list = - athena::WindowManager::Get()->GetWindowListProvider(); - DCHECK(window_list->GetWindowList().size()); - owner_window = window_list->GetWindowList().back(); - } - athena::Activity* activity = - athena::ActivityManager::Get()->GetActivityForWindow(owner_window); - return activity->GetWebContents(); -} diff --git a/chrome/browser/ui/views/athena/athena_util.h b/chrome/browser/ui/views/athena/athena_util.h deleted file mode 100644 index a5b2178..0000000 --- a/chrome/browser/ui/views/athena/athena_util.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2014 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_ATHENA_ATHENA_UTIL_H_ -#define CHROME_BROWSER_UI_VIEWS_ATHENA_ATHENA_UTIL_H_ - -namespace aura { -class Window; -} - -namespace content { -class WebContents; -} - -// Returns the web content associated with the window. -content::WebContents* GetWebContentsForWindow(aura::Window* owner_window); - -#endif // CHROME_BROWSER_UI_VIEWS_ATHENA_ATHENA_UTIL_H_ diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 4ec529e..979011a 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3052,11 +3052,6 @@ # chrome/browser/metrics/variations/generate_resources_map.py '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/generated_resources_map.cc', ], - 'conditions': [ - ['use_athena==1', { - 'defines': ['USE_ATHENA=1'], - }], - ], 'defines': [ '<@(nacl_defines)', ], diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index e1053d3..8d04918 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -464,6 +464,7 @@ 'browser/extensions/api/tab_capture/tab_capture_registry.cc', 'browser/extensions/api/tab_capture/tab_capture_registry.h', 'browser/extensions/api/tabs/tabs_api.h', + 'browser/extensions/api/tabs/tabs_api.cc', 'browser/extensions/api/tabs/tabs_constants.cc', 'browser/extensions/api/tabs/tabs_constants.h', 'browser/extensions/api/tabs/tabs_event_router.cc', @@ -563,6 +564,8 @@ 'browser/extensions/dev_mode_bubble_controller.h', 'browser/extensions/devtools_util.cc', 'browser/extensions/devtools_util.h', + 'browser/extensions/display_info_provider_chromeos.cc', + 'browser/extensions/display_info_provider_chromeos.h', 'browser/extensions/display_info_provider_mac.cc', 'browser/extensions/display_info_provider_mac.h', 'browser/extensions/display_info_provider_win.cc', @@ -659,6 +662,7 @@ 'browser/extensions/extension_system_factory.h', 'browser/extensions/extension_system_impl.cc', 'browser/extensions/extension_system_impl.h', + 'browser/extensions/extension_tab_util.cc', 'browser/extensions/extension_tab_util.h', 'browser/extensions/extension_toolbar_model.cc', 'browser/extensions/extension_toolbar_model.h', @@ -879,18 +883,6 @@ 'browser/extensions/api/storage/policy_value_store.cc', 'browser/extensions/api/storage/policy_value_store.h', ], - 'chrome_browser_extensions_non_athena_sources': [ - 'browser/extensions/api/tabs/tabs_api.cc', - 'browser/extensions/display_info_provider_chromeos.cc', - 'browser/extensions/display_info_provider_chromeos.h', - 'browser/extensions/extension_tab_util.cc', - ], - 'chrome_browser_extensions_athena_sources': [ - 'browser/extensions/api/tabs/tabs_api_athena.cc', - 'browser/extensions/display_info_provider_athena.cc', - 'browser/extensions/display_info_provider_athena.h', - 'browser/extensions/extension_tab_util_athena.cc', - ], }, # ---------------------------------------------------------------------------- # Note on GN build: everything below here is duplicated in @@ -1003,12 +995,6 @@ '../ui/keyboard/keyboard.gyp:keyboard_resources', ], }], - ['use_athena==1', { - 'defines': ['USE_ATHENA=1'], - 'sources': ['<@(chrome_browser_extensions_athena_sources)'], - }, { - 'sources': ['<@(chrome_browser_extensions_non_athena_sources)'], - }], ['OS=="linux"', { 'conditions': [ ['use_aura==1', { diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index fb2e565..798fdfc 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -904,10 +904,14 @@ 'browser/ui/webui/chromeos/first_run/first_run_actor.h', 'browser/ui/webui/chromeos/first_run/first_run_handler.cc', 'browser/ui/webui/chromeos/first_run/first_run_handler.h', + 'browser/ui/webui/chromeos/first_run/first_run_ui.cc', + 'browser/ui/webui/chromeos/first_run/first_run_ui.h', 'browser/ui/webui/chromeos/image_source.cc', 'browser/ui/webui/chromeos/image_source.h', 'browser/ui/webui/chromeos/imageburner/imageburner_ui.cc', 'browser/ui/webui/chromeos/imageburner/imageburner_ui.h', + 'browser/ui/webui/chromeos/keyboard_overlay_ui.cc', + 'browser/ui/webui/chromeos/keyboard_overlay_ui.h', 'browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc', 'browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h', 'browser/ui/webui/chromeos/login/authenticated_user_email_retriever.cc', @@ -1119,6 +1123,12 @@ 'browser/ui/ash/accessibility/ax_root_obj_wrapper.h', 'browser/ui/ash/accessibility/ax_tree_source_ash.cc', 'browser/ui/ash/accessibility/ax_tree_source_ash.h', + 'browser/ui/ash/app_list/app_list_controller_ash.cc', + 'browser/ui/ash/app_list/app_list_controller_ash.h', + 'browser/ui/ash/app_list/app_list_service_ash.cc', + 'browser/ui/ash/app_list/app_list_service_ash.h', + 'browser/ui/ash/ash_init.cc', + 'browser/ui/ash/ash_init.h', 'browser/ui/ash/ash_keyboard_controller_proxy.cc', 'browser/ui/ash/ash_keyboard_controller_proxy.h', 'browser/ui/ash/app_list/app_sync_ui_state_watcher.cc', @@ -1212,19 +1222,10 @@ 'browser/ui/ash/user_accounts_delegate_chromeos.h', 'browser/ui/ash/volume_controller_chromeos.cc', 'browser/ui/ash/volume_controller_chromeos.h', - 'browser/ui/views/touch_uma/touch_uma_ash.cc', - 'browser/ui/window_sizer/window_sizer_ash.cc', - ], - # Used when Ash is enabled but not Athena. - 'chrome_browser_ui_ash_non_athena_sources': [ - 'browser/ui/ash/ash_init.cc', - 'browser/ui/ash/ash_init.h', - 'browser/ui/ash/app_list/app_list_controller_ash.cc', - 'browser/ui/ash/app_list/app_list_controller_ash.h', - 'browser/ui/ash/app_list/app_list_service_ash.cc', - 'browser/ui/ash/app_list/app_list_service_ash.h', 'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc', 'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h', + 'browser/ui/views/touch_uma/touch_uma_ash.cc', + 'browser/ui/window_sizer/window_sizer_ash.cc', ], # Used when Ash is enabled but not ChromeOS. 'chrome_browser_ui_ash_non_chromeos': [ @@ -1252,29 +1253,6 @@ 'chrome_browser_ui_non_ash_sources': [ 'browser/ui/views/touch_uma/touch_uma.cc', ], - # Used when athena is enabled. - 'chrome_browser_ui_athena_sources': [ - #TODO(mukai): Port AppListService to Athena (crbug.com/417571) - 'browser/ui/app_list/app_list_service_disabled.cc', - - 'browser/ui/athena/extensions/extension_install_ui_factory_athena.cc', - 'browser/ui/views/athena/athena_util.cc', - 'browser/ui/views/athena/athena_util.h', - ], - # Used when not using mobile and not using Athena. - 'chrome_browser_ui_non_athena_non_mobile_sources': [ - 'browser/ui/extensions/extension_install_ui_factory.cc', - 'browser/ui/webui/chromeos/keyboard_overlay_ui.cc', - 'browser/ui/webui/chromeos/keyboard_overlay_ui.h', - 'browser/ui/webui/chromeos/first_run/first_run_ui.cc', - 'browser/ui/webui/chromeos/first_run/first_run_ui.h', - 'browser/ui/webui/options/chromeos/display_options_handler.cc', - 'browser/ui/webui/options/chromeos/display_options_handler.h', - 'browser/ui/webui/options/chromeos/display_overscan_handler.cc', - 'browser/ui/webui/options/chromeos/display_overscan_handler.h', - 'browser/ui/webui/options/chromeos/power_handler.cc', - 'browser/ui/webui/options/chromeos/power_handler.h', - ], # Cross-platform aura sources. 'chrome_browser_ui_aura_sources': [ 'browser/ui/aura/chrome_browser_main_extra_parts_aura.cc', @@ -1713,6 +1691,10 @@ 'browser/ui/webui/options/chromeos/cros_language_options_handler.h', 'browser/ui/webui/options/chromeos/date_time_options_handler.cc', 'browser/ui/webui/options/chromeos/date_time_options_handler.h', + 'browser/ui/webui/options/chromeos/display_options_handler.cc', + 'browser/ui/webui/options/chromeos/display_options_handler.h', + 'browser/ui/webui/options/chromeos/display_overscan_handler.cc', + 'browser/ui/webui/options/chromeos/display_overscan_handler.h', 'browser/ui/webui/options/chromeos/internet_options_handler.cc', 'browser/ui/webui/options/chromeos/internet_options_handler.h', 'browser/ui/webui/options/chromeos/internet_options_handler_strings.cc', @@ -1721,6 +1703,8 @@ 'browser/ui/webui/options/chromeos/keyboard_handler.h', 'browser/ui/webui/options/chromeos/pointer_handler.cc', 'browser/ui/webui/options/chromeos/pointer_handler.h', + 'browser/ui/webui/options/chromeos/power_handler.cc', + 'browser/ui/webui/options/chromeos/power_handler.h', 'browser/ui/webui/options/chromeos/proxy_handler.cc', 'browser/ui/webui/options/chromeos/proxy_handler.h', 'browser/ui/webui/options/chromeos/stats_options_handler.cc', @@ -2491,6 +2475,7 @@ 'browser/ui/extensions/extension_enable_flow_delegate.h', 'browser/ui/extensions/extension_install_ui_default.cc', 'browser/ui/extensions/extension_install_ui_default.h', + 'browser/ui/extensions/extension_install_ui_factory.cc', 'browser/ui/extensions/extension_install_ui_factory.h', 'browser/ui/extensions/extension_installed_bubble.cc', 'browser/ui/extensions/extension_installed_bubble.h', @@ -2839,25 +2824,6 @@ }, { # use_ash==0 'sources': [ '<@(chrome_browser_ui_non_ash_sources)' ], }], - ['use_athena==1', { - 'defines': ['USE_ATHENA=1'], - 'sources': [ '<@(chrome_browser_ui_athena_sources)' ], - 'dependencies': [ - '<(DEPTH)/athena/athena.gyp:athena_lib', - '<(DEPTH)/athena/athena.gyp:athena_chrome_lib', - '<(DEPTH)/athena/athena.gyp:athena_content_lib', - '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib', - ], - }, { # use_athena==0 - 'conditions': [ - ['OS!="android" and OS!="ios"', { - 'sources': [ '<@(chrome_browser_ui_non_athena_non_mobile_sources)' ], - }], - ['use_ash==1', { - 'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ], - }], - ], - }], ['toolkit_views==1', { 'sources': [ '<@(chrome_browser_ui_views_sources)' ], 'dependencies': [ diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index 0f7d8e7..c585684 100644 --- a/chrome/chrome_repack_chrome_100_percent.gypi +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -23,11 +23,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak', ], }], - ['use_athena==1', { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_resources_100_percent.pak', - ], - }], ['chromeos==1', { 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak', diff --git a/chrome/chrome_repack_chrome_200_percent.gypi b/chrome/chrome_repack_chrome_200_percent.gypi index f8ea76c..2aff0e5 100644 --- a/chrome/chrome_repack_chrome_200_percent.gypi +++ b/chrome/chrome_repack_chrome_200_percent.gypi @@ -23,11 +23,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_200_percent.pak', ], }], - ['use_athena==1', { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_resources_200_percent.pak', - ], - }], ['chromeos==1', { 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_200_percent.pak', diff --git a/chrome/chrome_repack_locales.gypi b/chrome/chrome_repack_locales.gypi index 1460fa3..e42708c 100644 --- a/chrome/chrome_repack_locales.gypi +++ b/chrome/chrome_repack_locales.gypi @@ -23,7 +23,7 @@ }, 'inputs': [ '<(repack_locales_path)', - '<!@pymod_do_main(repack_locales -i -p <(OS) <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) --use-ash <(use_ash) --use-athena <(use_athena) <(chromeos_flag) --enable-autofill-dialog <(enable_autofill_dialog) --enable-extensions <(enable_extensions) <(pak_locales))' + '<!@pymod_do_main(repack_locales -i -p <(OS) <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) --use-ash <(use_ash) <(chromeos_flag) --enable-autofill-dialog <(enable_autofill_dialog) --enable-extensions <(enable_extensions) <(pak_locales))' ], 'outputs': [ '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(pak_locales))' @@ -37,7 +37,6 @@ '-s', '<(SHARED_INTERMEDIATE_DIR)', '-x', '<(SHARED_INTERMEDIATE_DIR)/.', '--use-ash=<(use_ash)', - '--use-athena=<(use_athena)', '<@(chromeos_flag)', '--enable-autofill-dialog=<(enable_autofill_dialog)', '--enable-extensions=<(enable_extensions)', diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 0349764..09eeac1 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -468,12 +468,6 @@ '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', ], }], - ['use_athena==1', { - 'dependencies': [ - '<(DEPTH)/athena/resources/athena_resources.gyp:athena_resources', - '<(DEPTH)/athena/strings/athena_strings.gyp:athena_strings', - ], - }], ['enable_autofill_dialog==1 and OS!="android"', { 'dependencies': [ '<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 7f883f6..998ccdd 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2209,12 +2209,6 @@ }], ], }], - ['use_athena==1', { - 'sources!': [ - 'browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc', - 'browser/chromeos/extensions/wallpaper_private_api_unittest.cc', - ], - }], ['use_aura==1', { 'dependencies': [ '../ui/wm/wm.gyp:wm', diff --git a/chrome/common/extensions/api/schemas.gni b/chrome/common/extensions/api/schemas.gni index d39e99d..28299b1 100644 --- a/chrome/common/extensions/api/schemas.gni +++ b/chrome/common/extensions/api/schemas.gni @@ -16,9 +16,6 @@ gypi_values = exec_script("//build/gypi_to_gn.py", sources = gypi_values.main_schema_files if (is_chromeos) { sources += gypi_values.chromeos_schema_files - if (!use_athena) { - sources += gypi_values.chromeos_non_athena_schema_files - } } if (enable_webrtc) { sources += gypi_values.webrtc_schema_files diff --git a/chrome/common/extensions/api/schemas.gypi b/chrome/common/extensions/api/schemas.gypi index 518bb33..3fc34a0 100644 --- a/chrome/common/extensions/api/schemas.gypi +++ b/chrome/common/extensions/api/schemas.gypi @@ -119,10 +119,6 @@ 'file_system_provider_internal.idl', 'first_run_private.json', 'log_private.idl', - ], - - # ChromeOS-specific schemas which have not been ported to Athena. - 'chromeos_non_athena_schema_files': [ 'wallpaper.json', 'wallpaper_private.json', ], @@ -154,13 +150,6 @@ 'schema_files': [ '<@(chromeos_schema_files)', ], - 'conditions': [ - ['use_athena==0', { - 'schema_files': [ - '<@(chromeos_non_athena_schema_files)', - ], - }], - ], }], ['enable_webrtc==1', { 'schema_files': [ diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py index a5a8e9f..8fddff8 100755 --- a/chrome/tools/build/repack_locales.py +++ b/chrome/tools/build/repack_locales.py @@ -33,7 +33,6 @@ OS = None CHROMEOS = False USE_ASH = False -USE_ATHENA = False ENABLE_AUTOFILL_DIALOG = False ENABLE_EXTENSIONS = False @@ -89,11 +88,6 @@ def calc_inputs(locale): inputs.append(os.path.join(SHARE_INT_DIR, 'ash', 'strings', 'ash_strings_%s.pak' % locale)) - if USE_ATHENA: - #e.g. '<(SHARED_INTERMEDIATE_DIR)/athena/strings/athena_strings_da.pak', - inputs.append(os.path.join(SHARE_INT_DIR, 'athena', 'strings', - 'athena_strings_%s.pak' % locale)) - if CHROMEOS: inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'chromeos', 'strings', 'ui_chromeos_strings_%s.pak' % locale)) @@ -191,7 +185,6 @@ def DoMain(argv): global OS global CHROMEOS global USE_ASH - global USE_ATHENA global WHITELIST global ENABLE_AUTOFILL_DIALOG global ENABLE_EXTENSIONS @@ -217,8 +210,6 @@ def DoMain(argv): help="The target OS. (e.g. mac, linux, win, etc.)") parser.add_option("--use-ash", action="store", dest="use_ash", help="Whether to include ash strings") - parser.add_option("--use-athena", action="store", dest="use_athena", - help="Whether to include athena strings") parser.add_option("--chromeos", action="store", help="Whether building for Chrome OS") parser.add_option("--whitelist", action="store", help="Full path to the " @@ -244,7 +235,6 @@ def DoMain(argv): OS = options.os CHROMEOS = options.chromeos == '1' USE_ASH = options.use_ash == '1' - USE_ATHENA = options.use_athena == '1' WHITELIST = options.whitelist ENABLE_AUTOFILL_DIALOG = options.enable_autofill_dialog == '1' ENABLE_EXTENSIONS = options.enable_extensions == '1' diff --git a/extensions/shell/browser/desktop_controller.h b/extensions/shell/browser/desktop_controller.h index 84e02fe..bdcd8e1 100644 --- a/extensions/shell/browser/desktop_controller.h +++ b/extensions/shell/browser/desktop_controller.h @@ -27,8 +27,7 @@ class ShellAppWindow; // DesktopController is an interface to construct the window environment in // extensions shell. ShellDesktopControllerAura provides a default -// implementation for app_shell, and other embedders (such as athena) can -// provide their own. +// implementation for app_shell, and other embedders can provide their own. // TODO(jamescook|oshima): Clean up this interface now that there is only one // way to create an app window. class DesktopController { diff --git a/tools/check_grd_for_unused_strings.py b/tools/check_grd_for_unused_strings.py index aa088f5..8124b57 100755 --- a/tools/check_grd_for_unused_strings.py +++ b/tools/check_grd_for_unused_strings.py @@ -127,7 +127,6 @@ def main(): # If no GRD files were given, default them: if len(grd_files) == 0: ash_base_dir = os.path.join(src_dir, 'ash') - athena_strings_dir = os.path.join(src_dir, 'athena', 'strings') chrome_dir = os.path.join(src_dir, 'chrome') chrome_app_dir = os.path.join(chrome_dir, 'app') chrome_app_res_dir = os.path.join(chrome_app_dir, 'resources') @@ -138,7 +137,6 @@ def main(): grd_files = [ os.path.join(ash_base_dir, 'ash_strings.grd'), os.path.join(ash_base_dir, 'resources', 'ash_resources.grd'), - os.path.join(athena_strings_dir, 'athena_strings.grd'), os.path.join(chrome_app_dir, 'chromium_strings.grd'), os.path.join(chrome_app_dir, 'generated_resources.grd'), os.path.join(chrome_app_dir, 'google_chrome_strings.grd'), @@ -167,7 +165,6 @@ def main(): src_dirs = [ os.path.join(src_dir, 'app'), os.path.join(src_dir, 'ash'), - os.path.join(src_dir, 'athena'), os.path.join(src_dir, 'chrome'), os.path.join(src_dir, 'components'), os.path.join(src_dir, 'content'), |