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

Side by Side Diff: chrome/browser/devtools/devtools_window.cc

Issue 139983006: [DevTools] Handle frontend zoom similarly to tab zoom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Specific is_devtools check 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
« no previous file with comments | « chrome/browser/devtools/devtools_window.h ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/devtools/devtools_window.h" 5 #include "chrome/browser/devtools/devtools_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/prefs/scoped_user_pref_update.h" 14 #include "base/prefs/scoped_user_pref_update.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/chrome_notification_types.h" 21 #include "chrome/browser/chrome_notification_types.h"
22 #include "chrome/browser/chrome_page_zoom.h"
22 #include "chrome/browser/extensions/api/debugger/debugger_api.h" 23 #include "chrome/browser/extensions/api/debugger/debugger_api.h"
23 #include "chrome/browser/extensions/extension_service.h" 24 #include "chrome/browser/extensions/extension_service.h"
24 #include "chrome/browser/extensions/extension_web_contents_observer.h" 25 #include "chrome/browser/extensions/extension_web_contents_observer.h"
25 #include "chrome/browser/file_select_helper.h" 26 #include "chrome/browser/file_select_helper.h"
26 #include "chrome/browser/infobars/confirm_infobar_delegate.h" 27 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
27 #include "chrome/browser/infobars/infobar.h" 28 #include "chrome/browser/infobars/infobar.h"
28 #include "chrome/browser/prefs/pref_service_syncable.h" 29 #include "chrome/browser/prefs/pref_service_syncable.h"
29 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
30 #include "chrome/browser/sessions/session_tab_helper.h" 31 #include "chrome/browser/sessions/session_tab_helper.h"
31 #include "chrome/browser/themes/theme_properties.h" 32 #include "chrome/browser/themes/theme_properties.h"
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 // Update dev tools to reflect removed dev tools window. 846 // Update dev tools to reflect removed dev tools window.
846 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); 847 BrowserWindow* inspected_window = GetInspectedBrowserWindow();
847 if (inspected_window) 848 if (inspected_window)
848 inspected_window->UpdateDevTools(); 849 inspected_window->UpdateDevTools();
849 // In case of docked web_contents_, we own it so delete here. 850 // In case of docked web_contents_, we own it so delete here.
850 // Embedding DevTools window will be deleted as a result of 851 // Embedding DevTools window will be deleted as a result of
851 // WebContentsDestroyed callback. 852 // WebContentsDestroyed callback.
852 delete web_contents_; 853 delete web_contents_;
853 } 854 }
854 855
856 void DevToolsWindow::ContentsZoomChange(bool zoom_in) {
857 DCHECK(is_docked_);
858 chrome_page_zoom::Zoom(web_contents(),
859 zoom_in ? content::PAGE_ZOOM_IN : content::PAGE_ZOOM_OUT);
860 }
861
855 void DevToolsWindow::BeforeUnloadFired(content::WebContents* tab, 862 void DevToolsWindow::BeforeUnloadFired(content::WebContents* tab,
856 bool proceed, 863 bool proceed,
857 bool* proceed_to_fire_unload) { 864 bool* proceed_to_fire_unload) {
858 if (!intercepted_page_beforeunload_) { 865 if (!intercepted_page_beforeunload_) {
859 // Docked devtools window closed directly. 866 // Docked devtools window closed directly.
860 if (proceed) { 867 if (proceed) {
861 content::DevToolsManager::GetInstance()->ClientHostClosing( 868 content::DevToolsManager::GetInstance()->ClientHostClosing(
862 frontend_host_.get()); 869 frontend_host_.get());
863 } 870 }
864 *proceed_to_fire_unload = proceed; 871 *proceed_to_fire_unload = proceed;
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 if (load_state_ == kLoadCompleted) 1507 if (load_state_ == kLoadCompleted)
1501 LoadCompleted(); 1508 LoadCompleted();
1502 } 1509 }
1503 1510
1504 void DevToolsWindow::LoadCompleted() { 1511 void DevToolsWindow::LoadCompleted() {
1505 Show(action_on_load_); 1512 Show(action_on_load_);
1506 action_on_load_ = DevToolsToggleAction::NoOp(); 1513 action_on_load_ = DevToolsToggleAction::NoOp();
1507 UpdateTheme(); 1514 UpdateTheme();
1508 AddDevToolsExtensionsToClient(); 1515 AddDevToolsExtensionsToClient();
1509 } 1516 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/devtools_window.h ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698