diff options
Diffstat (limited to 'chrome/browser/ui')
6 files changed, 61 insertions, 129 deletions
diff --git a/chrome/browser/ui/view_ids.h b/chrome/browser/ui/view_ids.h index f5ce29e..f02b67a 100644 --- a/chrome/browser/ui/view_ids.h +++ b/chrome/browser/ui/view_ids.h @@ -53,7 +53,6 @@ enum ViewID { VIEW_ID_STAR_BUTTON, VIEW_ID_APP_MENU, VIEW_ID_BROWSER_ACTION_TOOLBAR, - VIEW_ID_BROWSER_ACTION, VIEW_ID_FEEDBACK_BUTTON, VIEW_ID_OMNIBOX, VIEW_ID_SCRIPT_BUBBLE, diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc index 41d48de..43532db 100644 --- a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc @@ -11,12 +11,10 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_message_bubble_controller.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/proxy_overridden_bubble_controller.h" #include "chrome/browser/extensions/settings_api_bubble_controller.h" #include "chrome/browser/extensions/settings_api_helpers.h" #include "chrome/browser/extensions/suspicious_extension_bubble_controller.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h" @@ -64,7 +62,6 @@ ExtensionMessageBubbleView::ExtensionMessageBubbleView( : BubbleDelegateView(anchor_view, arrow_location), weak_factory_(this), controller_(controller.Pass()), - anchor_view_(anchor_view), headline_(NULL), learn_more_(NULL), dismiss_button_(NULL), @@ -159,8 +156,7 @@ void ExtensionMessageBubbleView::Init() { views::Label* message = new views::Label(); message->SetMultiLine(true); message->SetHorizontalAlignment(gfx::ALIGN_LEFT); - message->SetText(delegate->GetMessageBody( - anchor_view_->id() == VIEW_ID_BROWSER_ACTION)); + message->SetText(delegate->GetMessageBody()); message->SizeToFit(views::Widget::GetLocalizedContentsWidth( IDS_EXTENSION_WIPEOUT_BUBBLE_WIDTH_CHARS)); layout->AddView(message); @@ -276,7 +272,6 @@ ExtensionMessageBubbleFactory::ExtensionMessageBubbleFactory( toolbar_view_(toolbar_view), shown_suspicious_extensions_bubble_(false), shown_startup_override_extensions_bubble_(false), - shown_proxy_override_extensions_bubble_(false), shown_dev_mode_extensions_bubble_(false), is_observing_(false), stage_(STAGE_START), @@ -309,10 +304,6 @@ void ExtensionMessageBubbleFactory::MaybeShow(views::View* anchor_view) { MaybeShowStartupOverrideExtensionsBubble(anchor_view)) return; - if (!shown_proxy_override_extensions_bubble_ && - MaybeShowProxyOverrideExtensionsBubble(anchor_view)) - return; - if (!shown_dev_mode_extensions_bubble_) MaybeShowDevModeExtensionsBubble(anchor_view); #endif // OS_WIN @@ -345,11 +336,11 @@ bool ExtensionMessageBubbleFactory::MaybeShowStartupOverrideExtensionsBubble( views::View* anchor_view) { #if !defined(OS_WIN) return false; -#else +#endif + DCHECK(!shown_startup_override_extensions_bubble_); - const Extension* extension = - GetExtensionOverridingStartupPages(profile_, NULL); + const Extension* extension = OverridesStartupPages(profile_, NULL); if (!extension) return false; @@ -360,34 +351,15 @@ bool ExtensionMessageBubbleFactory::MaybeShowStartupOverrideExtensionsBubble( return false; shown_startup_override_extensions_bubble_ = true; - PrepareToHighlightExtensions( - settings_api_bubble.PassAs<ExtensionMessageBubbleController>(), - anchor_view); - return true; -#endif -} - -bool ExtensionMessageBubbleFactory::MaybeShowProxyOverrideExtensionsBubble( - views::View* anchor_view) { -#if !defined(OS_WIN) - return false; -#else - DCHECK(!shown_proxy_override_extensions_bubble_); - - const Extension* extension = GetExtensionOverridingProxy(profile_); - if (!extension) - return false; - - scoped_ptr<ProxyOverriddenBubbleController> proxy_bubble( - new ProxyOverriddenBubbleController(profile_)); - if (!proxy_bubble->ShouldShow(extension->id())) - return false; + SettingsApiBubbleController* weak_controller = settings_api_bubble.get(); + ExtensionMessageBubbleView* bubble_delegate = new ExtensionMessageBubbleView( + anchor_view, + views::BubbleBorder::TOP_RIGHT, + settings_api_bubble.PassAs<ExtensionMessageBubbleController>()); + views::BubbleDelegateView::CreateBubble(bubble_delegate); + weak_controller->Show(bubble_delegate); - shown_proxy_override_extensions_bubble_ = true; - PrepareToHighlightExtensions( - proxy_bubble.PassAs<ExtensionMessageBubbleController>(), anchor_view); return true; -#endif } bool ExtensionMessageBubbleFactory::MaybeShowDevModeExtensionsBubble( @@ -403,9 +375,23 @@ bool ExtensionMessageBubbleFactory::MaybeShowDevModeExtensionsBubble( return false; shown_dev_mode_extensions_bubble_ = true; - PrepareToHighlightExtensions( - dev_mode_extensions.PassAs<ExtensionMessageBubbleController>(), - anchor_view); + + // We should be in the start stage (i.e., should not have a pending attempt to + // show a bubble). + DCHECK_EQ(stage_, STAGE_START); + + // Prepare to display and highlight the developer mode extensions before + // showing the bubble. Since this is an asynchronous process, set member + // variables for later use. + controller_ = dev_mode_extensions.Pass(); + anchor_view_ = anchor_view; + container_ = toolbar_view_->browser_actions(); + + if (container_->animating()) + MaybeObserve(); + else + HighlightDevModeExtensions(); + return true; } @@ -434,9 +420,9 @@ bool ExtensionMessageBubbleFactory::IsInitialProfileCheck(Profile* profile) { void ExtensionMessageBubbleFactory::OnBrowserActionsContainerAnimationEnded() { MaybeStopObserving(); if (stage_ == STAGE_START) { - HighlightExtensions(); + HighlightDevModeExtensions(); } else if (stage_ == STAGE_HIGHLIGHTED) { - ShowHighlightingBubble(); + ShowDevModeBubble(); } else { // We shouldn't be observing if we've completed the process. NOTREACHED(); Finish(); @@ -449,26 +435,7 @@ void ExtensionMessageBubbleFactory::OnBrowserActionsContainerDestroyed() { Finish(); } -void ExtensionMessageBubbleFactory::PrepareToHighlightExtensions( - scoped_ptr<ExtensionMessageBubbleController> controller, - views::View* anchor_view) { - // We should be in the start stage (i.e., should not have a pending attempt to - // show a bubble). - DCHECK_EQ(stage_, STAGE_START); - - // Prepare to display and highlight the extensions before showing the bubble. - // Since this is an asynchronous process, set member variables for later use. - controller_ = controller.Pass(); - anchor_view_ = anchor_view; - container_ = toolbar_view_->browser_actions(); - - if (container_->animating()) - MaybeObserve(); - else - HighlightExtensions(); -} - -void ExtensionMessageBubbleFactory::HighlightExtensions() { +void ExtensionMessageBubbleFactory::HighlightDevModeExtensions() { DCHECK_EQ(STAGE_START, stage_); stage_ = STAGE_HIGHLIGHTED; @@ -478,10 +445,10 @@ void ExtensionMessageBubbleFactory::HighlightExtensions() { if (container_->animating()) MaybeObserve(); else - ShowHighlightingBubble(); + ShowDevModeBubble(); } -void ExtensionMessageBubbleFactory::ShowHighlightingBubble() { +void ExtensionMessageBubbleFactory::ShowDevModeBubble() { DCHECK_EQ(stage_, STAGE_HIGHLIGHTED); stage_ = STAGE_COMPLETE; @@ -491,13 +458,11 @@ void ExtensionMessageBubbleFactory::ShowHighlightingBubble() { if (reference_view && reference_view->visible()) anchor_view_ = reference_view; - ExtensionMessageBubbleController* weak_controller = controller_.get(); - ExtensionMessageBubbleView* bubble_delegate = - new ExtensionMessageBubbleView( - anchor_view_, - views::BubbleBorder::TOP_RIGHT, - scoped_ptr<ExtensionMessageBubbleController>( - controller_.release())); + DevModeBubbleController* weak_controller = controller_.get(); + ExtensionMessageBubbleView* bubble_delegate = new ExtensionMessageBubbleView( + anchor_view_, + views::BubbleBorder::TOP_RIGHT, + scoped_ptr<ExtensionMessageBubbleController>(controller_.release())); views::BubbleDelegateView::CreateBubble(bubble_delegate); weak_controller->Show(bubble_delegate); diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view.h b/chrome/browser/ui/views/extensions/extension_message_bubble_view.h index 322139f..c615c18 100644 --- a/chrome/browser/ui/views/extensions/extension_message_bubble_view.h +++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view.h @@ -60,11 +60,6 @@ class ExtensionMessageBubbleFactory : public BrowserActionsContainerObserver { // Returns true if we show the view (or start the process). bool MaybeShowStartupOverrideExtensionsBubble(views::View* anchor_view); - // Shows the bubble for when there are extensions overriding the proxy (if we - // have not done so already). Returns true if we show the view (or start the - // process of doing so). - bool MaybeShowProxyOverrideExtensionsBubble(views::View* anchor_view); - // Shows the developer mode extensions bubble, if there are extensions running // in developer mode and we have not done so already. // Returns true if we show the view (or start the process). @@ -84,17 +79,11 @@ class ExtensionMessageBubbleFactory : public BrowserActionsContainerObserver { virtual void OnBrowserActionsContainerAnimationEnded() OVERRIDE; virtual void OnBrowserActionsContainerDestroyed() OVERRIDE; - // Sets the stage for highlighting extensions and then showing the bubble - // controlled by |controller|, anchored to |anchor_view|. - void PrepareToHighlightExtensions( - scoped_ptr<ExtensionMessageBubbleController> controller, - views::View* anchor_view); - // Inform the ExtensionToolbarModel to highlight the appropriate extensions. - void HighlightExtensions(); + void HighlightDevModeExtensions(); - // Shows the waiting bubbble, after highlighting the extensions. - void ShowHighlightingBubble(); + // Shows the developer mode bubble, after highlighting the extensions. + void ShowDevModeBubble(); // Finishes the process of showing the developer mode bubble. void Finish(); @@ -112,10 +101,6 @@ class ExtensionMessageBubbleFactory : public BrowserActionsContainerObserver { // the user about the startup pages being overridden. bool shown_startup_override_extensions_bubble_; - // Whether or not we have shown the bubble notifying the user about the proxy - // being overridden. - bool shown_proxy_override_extensions_bubble_; - // Whether or not we have shown the developer mode extensions bubble. bool shown_dev_mode_extensions_bubble_; @@ -134,9 +119,9 @@ class ExtensionMessageBubbleFactory : public BrowserActionsContainerObserver { // is not currently in the process of showing a bubble. views::View* anchor_view_; - // The controller to show a bubble for. This will be NULL if the factory is - // not currently in the process of showing a bubble. - scoped_ptr<ExtensionMessageBubbleController> controller_; + // The DevModeBubbleController to use. This will be NULL if the factory is not + // currently in the process of showing a bubble. + scoped_ptr<DevModeBubbleController> controller_; DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleFactory); }; @@ -187,9 +172,6 @@ class ExtensionMessageBubbleView : public ExtensionMessageBubble, // The controller for this bubble. scoped_ptr<ExtensionMessageBubbleController> controller_; - // The view this bubble is anchored against. - views::View* anchor_view_; - // The headline, labels and buttons on the bubble. views::Label* headline_; views::Link* learn_more_; diff --git a/chrome/browser/ui/views/settings_api_bubble_helper_views.cc b/chrome/browser/ui/views/settings_api_bubble_helper_views.cc index c3dc7f4..67199cd 100644 --- a/chrome/browser/ui/views/settings_api_bubble_helper_views.cc +++ b/chrome/browser/ui/views/settings_api_bubble_helper_views.cc @@ -19,40 +19,40 @@ #include "content/public/browser/browser_url_handler.h" #include "content/public/browser/navigation_entry.h" -namespace extensions { - namespace { -void ShowSettingsApiBubble(SettingsApiOverrideType type, +void ShowSettingsApiBubble(extensions::SettingsApiOverrideType type, const std::string& extension_id, Profile* profile, views::View* anchor_view, views::BubbleBorder::Arrow arrow) { - scoped_ptr<SettingsApiBubbleController> settings_api_bubble( - new SettingsApiBubbleController(profile, type)); + scoped_ptr<extensions::SettingsApiBubbleController> settings_api_bubble( + new extensions::SettingsApiBubbleController(profile, type)); if (!settings_api_bubble->ShouldShow(extension_id)) return; - SettingsApiBubbleController* controller = settings_api_bubble.get(); - ExtensionMessageBubbleView* bubble_delegate = - new ExtensionMessageBubbleView( + extensions::SettingsApiBubbleController* controller = + settings_api_bubble.get(); + extensions::ExtensionMessageBubbleView* bubble_delegate = + new extensions::ExtensionMessageBubbleView( anchor_view, arrow, settings_api_bubble.PassAs< - ExtensionMessageBubbleController>()); + extensions::ExtensionMessageBubbleController>()); views::BubbleDelegateView::CreateBubble(bubble_delegate); controller->Show(bubble_delegate); } } // namespace +namespace extensions { + void MaybeShowExtensionControlledHomeNotification(Browser* browser) { #if !defined(OS_WIN) return; #endif - const Extension* extension = - GetExtensionOverridingHomepage(browser->profile(), NULL); + const Extension* extension = OverridesHomepage(browser->profile(), NULL); if (extension) { // The bubble will try to anchor itself against the home button views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser)-> @@ -76,7 +76,7 @@ void MaybeShowExtensionControlledSearchNotification( if (AutocompleteMatch::IsSearchType(match.type) && match.type != AutocompleteMatchType::SEARCH_OTHER_ENGINE) { const Extension* extension = - GetExtensionOverridingSearchEngine(profile, NULL); + OverridesSearchEngine(profile, NULL); if (extension) { ToolbarView* toolbar = BrowserView::GetBrowserViewForBrowser( diff --git a/chrome/browser/ui/views/toolbar/browser_action_view.cc b/chrome/browser/ui/views/toolbar/browser_action_view.cc index 6c13116..6507988 100644 --- a/chrome/browser/ui/views/toolbar/browser_action_view.cc +++ b/chrome/browser/ui/views/toolbar/browser_action_view.cc @@ -15,7 +15,6 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "extensions/common/extension.h" @@ -52,7 +51,6 @@ BrowserActionView::BrowserActionView(const Extension* extension, delegate_(delegate), button_(NULL), extension_(extension) { - set_id(VIEW_ID_BROWSER_ACTION); button_ = new BrowserActionButton(extension_, browser_, delegate_); button_->set_drag_controller(delegate_); button_->set_owned_by_client(); diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 0446457..a12487e 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -309,7 +309,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME }, { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME }, - { "sectionTitleProxy", IDS_OPTIONS_PROXY_GROUP_NAME }, { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, @@ -1708,13 +1707,9 @@ void BrowserOptionsHandler::SetupProxySettingsSection() { base::FundamentalValue disabled(is_win_ash || (proxy_config && !proxy_config->IsUserModifiable())); base::FundamentalValue extension_controlled(is_extension_controlled); - web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsButton", + web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", disabled, extension_controlled); -#if defined(OS_WIN) - SetupExtensionControlledIndicators(); -#endif // defined(OS_WIN) - #endif // !defined(OS_CHROMEOS) } @@ -1754,18 +1749,16 @@ void BrowserOptionsHandler::SetupExtensionControlledIndicators() { base::DictionaryValue extension_controlled; // Check if an extension is overriding the Search Engine. - const extensions::Extension* extension = - extensions::GetExtensionOverridingSearchEngine( - Profile::FromWebUI(web_ui()), NULL); + const extensions::Extension* extension = extensions::OverridesSearchEngine( + Profile::FromWebUI(web_ui()), NULL); AppendExtensionData("searchEngine", extension, &extension_controlled); // Check if an extension is overriding the Home page. - extension = extensions::GetExtensionOverridingHomepage( - Profile::FromWebUI(web_ui()), NULL); + extension = extensions::OverridesHomepage(Profile::FromWebUI(web_ui()), NULL); AppendExtensionData("homePage", extension, &extension_controlled); // Check if an extension is overriding the Startup pages. - extension = extensions::GetExtensionOverridingStartupPages( + extension = extensions::OverridesStartupPages( Profile::FromWebUI(web_ui()), NULL); AppendExtensionData("startUpPage", extension, &extension_controlled); @@ -1786,11 +1779,6 @@ void BrowserOptionsHandler::SetupExtensionControlledIndicators() { } AppendExtensionData("newTabPage", extension, &extension_controlled); - // Check if an extension is overwriting the proxy setting. - extension = extensions::GetExtensionOverridingProxy( - Profile::FromWebUI(web_ui())); - AppendExtensionData("proxy", extension, &extension_controlled); - web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", extension_controlled); #endif // defined(OS_WIN) |