Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1274)

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 139983006: [DevTools] Handle frontend zoom similarly to tab zoom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 1747 matching lines...) Expand 10 before | Expand all | Expand 10 after
1758 window_->SetStarredState(starred); 1758 window_->SetStarredState(starred);
1759 } 1759 }
1760 1760
1761 /////////////////////////////////////////////////////////////////////////////// 1761 ///////////////////////////////////////////////////////////////////////////////
1762 // Browser, ZoomObserver implementation: 1762 // Browser, ZoomObserver implementation:
1763 1763
1764 void Browser::OnZoomChanged(content::WebContents* source, 1764 void Browser::OnZoomChanged(content::WebContents* source,
1765 bool can_show_bubble) { 1765 bool can_show_bubble) {
1766 if (source == tab_strip_model_->GetActiveWebContents()) { 1766 if (source == tab_strip_model_->GetActiveWebContents()) {
1767 // Only show the zoom bubble for zoom changes in the active window. 1767 // Only show the zoom bubble for zoom changes in the active window.
1768 window_->ZoomChangedForActiveTab(can_show_bubble && window_->IsActive()); 1768 window_->ZoomChangedForActiveTab(can_show_bubble && window_->IsActive() &&
1769 SupportsWindowFeature(FEATURE_LOCATIONBAR));
vsevik 2014/02/12 15:13:43 This will disable zoom bubble for Chrome Apps. I d
jochen (gone - plz use gerrit) 2014/02/12 15:17:42 I agree, this should be addressed before we land t
dgozman 2014/02/12 16:27:16 Apps don't have zoom, and they have not decided ye
vsevik 2014/02/13 08:02:26 I agree that DevTools do not need UI for zoom (we
dgozman 2014/02/13 10:08:25 Done.
1769 } 1770 }
1770 } 1771 }
1771 1772
1772 /////////////////////////////////////////////////////////////////////////////// 1773 ///////////////////////////////////////////////////////////////////////////////
1773 // Browser, ui::SelectFileDialog::Listener implementation: 1774 // Browser, ui::SelectFileDialog::Listener implementation:
1774 1775
1775 void Browser::FileSelected(const base::FilePath& path, int index, 1776 void Browser::FileSelected(const base::FilePath& path, int index,
1776 void* params) { 1777 void* params) {
1777 FileSelectedWithExtraInfo(ui::SelectedFileInfo(path, path), index, params); 1778 FileSelectedWithExtraInfo(ui::SelectedFileInfo(path, path), index, params);
1778 } 1779 }
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
2300 if (contents && !allow_js_access) { 2301 if (contents && !allow_js_access) {
2301 contents->web_contents()->GetController().LoadURL( 2302 contents->web_contents()->GetController().LoadURL(
2302 target_url, 2303 target_url,
2303 content::Referrer(), 2304 content::Referrer(),
2304 content::PAGE_TRANSITION_LINK, 2305 content::PAGE_TRANSITION_LINK,
2305 std::string()); // No extra headers. 2306 std::string()); // No extra headers.
2306 } 2307 }
2307 2308
2308 return contents != NULL; 2309 return contents != NULL;
2309 } 2310 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698