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

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

Issue 10446106: Preliminary metro snap plumbing. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Cleanup Created 8 years, 6 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/ui/browser.h ('k') | chrome/browser/ui/browser_window.h » ('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/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 // OS_WIN 10 #endif // OS_WIN
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 #include "ui/base/animation/animation.h" 185 #include "ui/base/animation/animation.h"
186 #include "ui/base/l10n/l10n_util.h" 186 #include "ui/base/l10n/l10n_util.h"
187 #include "ui/gfx/point.h" 187 #include "ui/gfx/point.h"
188 #include "webkit/glue/web_intent_data.h" 188 #include "webkit/glue/web_intent_data.h"
189 #include "webkit/glue/web_intent_service_data.h" 189 #include "webkit/glue/web_intent_service_data.h"
190 #include "webkit/glue/webkit_glue.h" 190 #include "webkit/glue/webkit_glue.h"
191 #include "webkit/glue/window_open_disposition.h" 191 #include "webkit/glue/window_open_disposition.h"
192 #include "webkit/plugins/webplugininfo.h" 192 #include "webkit/plugins/webplugininfo.h"
193 193
194 #if defined(OS_WIN) 194 #if defined(OS_WIN)
195 #include "base/win/metro.h"
195 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" 196 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
196 #include "chrome/browser/shell_integration.h" 197 #include "chrome/browser/shell_integration.h"
197 #include "chrome/browser/ssl/ssl_error_info.h" 198 #include "chrome/browser/ssl/ssl_error_info.h"
198 #include "chrome/browser/task_manager/task_manager.h" 199 #include "chrome/browser/task_manager/task_manager.h"
199 #include "chrome/browser/ui/view_ids.h" 200 #include "chrome/browser/ui/view_ids.h"
200 #include "ui/base/win/shell.h" 201 #include "ui/base/win/shell.h"
201 #endif // OS_WIN 202 #endif // OS_WIN
202 203
203 #if defined(OS_MACOSX) 204 #if defined(OS_MACOSX)
204 #include "ui/base/cocoa/find_pasteboard.h" 205 #include "ui/base/cocoa/find_pasteboard.h"
(...skipping 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after
1508 } 1509 }
1509 1510
1510 void Browser::ToggleFullscreenMode() { 1511 void Browser::ToggleFullscreenMode() {
1511 fullscreen_controller_->ToggleFullscreenMode(); 1512 fullscreen_controller_->ToggleFullscreenMode();
1512 } 1513 }
1513 1514
1514 void Browser::ToggleFullscreenModeWithExtension(const GURL& extension_url) { 1515 void Browser::ToggleFullscreenModeWithExtension(const GURL& extension_url) {
1515 fullscreen_controller_->ToggleFullscreenModeWithExtension(extension_url); 1516 fullscreen_controller_->ToggleFullscreenModeWithExtension(extension_url);
1516 } 1517 }
1517 1518
1519 #if defined(OS_WIN)
1520 void Browser::ToggleMetroSnapMode(bool enable) {
sky 2012/06/08 16:50:51 This needs to feed into SupportsWindowFeatureImpl.
robertshield 2012/06/08 19:12:19 As currently implemented, enabling metro snap impl
1521 fullscreen_controller_->ToggleMetroSnapMode(enable);
1522 }
1523 #endif
1524
1518 #if defined(OS_MACOSX) 1525 #if defined(OS_MACOSX)
1519 void Browser::TogglePresentationMode() { 1526 void Browser::TogglePresentationMode() {
1520 fullscreen_controller_->TogglePresentationMode(); 1527 fullscreen_controller_->TogglePresentationMode();
1521 } 1528 }
1522 #endif 1529 #endif
1523 1530
1524 void Browser::Exit() { 1531 void Browser::Exit() {
1525 content::RecordAction(UserMetricsAction("Exit")); 1532 content::RecordAction(UserMetricsAction("Exit"));
1526 browser::AttemptUserExit(); 1533 browser::AttemptUserExit();
1527 } 1534 }
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after
2481 case IDC_SELECT_TAB_4: 2488 case IDC_SELECT_TAB_4:
2482 case IDC_SELECT_TAB_5: 2489 case IDC_SELECT_TAB_5:
2483 case IDC_SELECT_TAB_6: 2490 case IDC_SELECT_TAB_6:
2484 case IDC_SELECT_TAB_7: SelectNumberedTab(id - IDC_SELECT_TAB_0); 2491 case IDC_SELECT_TAB_7: SelectNumberedTab(id - IDC_SELECT_TAB_0);
2485 break; 2492 break;
2486 case IDC_SELECT_LAST_TAB: SelectLastTab(); break; 2493 case IDC_SELECT_LAST_TAB: SelectLastTab(); break;
2487 case IDC_DUPLICATE_TAB: DuplicateTab(); break; 2494 case IDC_DUPLICATE_TAB: DuplicateTab(); break;
2488 case IDC_RESTORE_TAB: RestoreTab(); break; 2495 case IDC_RESTORE_TAB: RestoreTab(); break;
2489 case IDC_COPY_URL: WriteCurrentURLToClipboard(); break; 2496 case IDC_COPY_URL: WriteCurrentURLToClipboard(); break;
2490 case IDC_SHOW_AS_TAB: ConvertPopupToTabbedBrowser(); break; 2497 case IDC_SHOW_AS_TAB: ConvertPopupToTabbedBrowser(); break;
2491 case IDC_FULLSCREEN: ToggleFullscreenMode(); break; 2498 case IDC_FULLSCREEN: ToggleFullscreenMode(); break;
2499 #if defined(OS_WIN)
2500 case IDC_METRO_SNAP_ENABLE: ToggleMetroSnapMode(true); break;
2501 case IDC_METRO_SNAP_DISABLE: ToggleMetroSnapMode(false); break;
2502 #endif
2492 #if defined(OS_MACOSX) 2503 #if defined(OS_MACOSX)
2493 case IDC_PRESENTATION_MODE: TogglePresentationMode(); break; 2504 case IDC_PRESENTATION_MODE: TogglePresentationMode(); break;
2494 #endif 2505 #endif
2495 case IDC_EXIT: Exit(); break; 2506 case IDC_EXIT: Exit(); break;
2496 2507
2497 // Page-related commands 2508 // Page-related commands
2498 case IDC_SAVE_PAGE: SavePage(); break; 2509 case IDC_SAVE_PAGE: SavePage(); break;
2499 case IDC_BOOKMARK_PAGE: BookmarkCurrentPage(); break; 2510 case IDC_BOOKMARK_PAGE: BookmarkCurrentPage(); break;
2500 case IDC_PIN_TO_START_SCREEN: PinCurrentPageToStartScreen(); break; 2511 case IDC_PIN_TO_START_SCREEN: PinCurrentPageToStartScreen(); break;
2501 case IDC_BOOKMARK_ALL_TABS: BookmarkAllTabs(); break; 2512 case IDC_BOOKMARK_ALL_TABS: BookmarkAllTabs(); break;
2502 case IDC_VIEW_SOURCE: ViewSelectedSource(); break; 2513 case IDC_VIEW_SOURCE: ViewSelectedSource(); break;
2503 case IDC_EMAIL_PAGE_LOCATION: EmailPageLocation(); break; 2514 case IDC_EMAIL_PAGE_LOCATION: EmailPageLocation(); break;
(...skipping 1634 matching lines...) Expand 10 before | Expand all | Expand 10 after
4138 command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_PREVIOUS, normal_window); 4149 command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_PREVIOUS, normal_window);
4139 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_0, normal_window); 4150 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_0, normal_window);
4140 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_1, normal_window); 4151 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_1, normal_window);
4141 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_2, normal_window); 4152 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_2, normal_window);
4142 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_3, normal_window); 4153 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_3, normal_window);
4143 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_4, normal_window); 4154 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_4, normal_window);
4144 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_5, normal_window); 4155 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_5, normal_window);
4145 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, normal_window); 4156 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, normal_window);
4146 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window); 4157 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window);
4147 command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window); 4158 command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window);
4159 #if defined(OS_WIN)
4160 const bool metro_mode = (base::win::GetMetroModule() != NULL);
4161 command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_ENABLE, metro_mode);
4162 command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_DISABLE, metro_mode);
4163 #endif
4148 #if defined(OS_MACOSX) 4164 #if defined(OS_MACOSX)
4149 command_updater_.UpdateCommandEnabled(IDC_TABPOSE, normal_window); 4165 command_updater_.UpdateCommandEnabled(IDC_TABPOSE, normal_window);
4150 command_updater_.UpdateCommandEnabled(IDC_PRESENTATION_MODE, 4166 command_updater_.UpdateCommandEnabled(IDC_PRESENTATION_MODE,
4151 !(is_type_panel() && is_app())); 4167 !(is_type_panel() && is_app()));
4152 #endif 4168 #endif
4153 4169
4154 // Clipboard commands 4170 // Clipboard commands
4155 command_updater_.UpdateCommandEnabled(IDC_COPY_URL, !is_devtools()); 4171 command_updater_.UpdateCommandEnabled(IDC_COPY_URL, !is_devtools());
4156 4172
4157 // Find-in-page 4173 // Find-in-page
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
5173 if (contents && !allow_js_access) { 5189 if (contents && !allow_js_access) {
5174 contents->web_contents()->GetController().LoadURL( 5190 contents->web_contents()->GetController().LoadURL(
5175 target_url, 5191 target_url,
5176 content::Referrer(), 5192 content::Referrer(),
5177 content::PAGE_TRANSITION_LINK, 5193 content::PAGE_TRANSITION_LINK,
5178 std::string()); // No extra headers. 5194 std::string()); // No extra headers.
5179 } 5195 }
5180 5196
5181 return contents != NULL; 5197 return contents != NULL;
5182 } 5198 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698