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

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

Issue 22992003: Moved chrome/browser/ui/extensions apps code to chrome/browser/ui/apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Win compile Created 7 years, 4 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 | Annotate | Revision Log
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_command_controller.h" 5 #include "chrome/browser/ui/browser_command_controller.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 28 matching lines...) Expand all
39 #include "content/public/common/url_constants.h" 39 #include "content/public/common/url_constants.h"
40 #include "ui/base/keycodes/keyboard_codes.h" 40 #include "ui/base/keycodes/keyboard_codes.h"
41 41
42 #if defined(OS_MACOSX) 42 #if defined(OS_MACOSX)
43 #include "chrome/browser/ui/browser_commands_mac.h" 43 #include "chrome/browser/ui/browser_commands_mac.h"
44 #endif 44 #endif
45 45
46 #if defined(OS_WIN) 46 #if defined(OS_WIN)
47 #include "base/win/metro.h" 47 #include "base/win/metro.h"
48 #include "base/win/windows_version.h" 48 #include "base/win/windows_version.h"
49 #include "chrome/browser/ui/extensions/apps_metro_handler_win.h" 49 #include "chrome/browser/ui/apps/apps_metro_handler_win.h"
50 #endif 50 #endif
51 51
52 #if defined(USE_ASH) 52 #if defined(USE_ASH)
53 #include "chrome/browser/ui/ash/ash_util.h" 53 #include "chrome/browser/ui/ash/ash_util.h"
54 #endif 54 #endif
55 55
56 using content::NavigationEntry; 56 using content::NavigationEntry;
57 using content::NavigationController; 57 using content::NavigationController;
58 using content::WebContents; 58 using content::WebContents;
59 59
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 browser_->SetMetroSnapMode(true); 441 browser_->SetMetroSnapMode(true);
442 break; 442 break;
443 case IDC_METRO_SNAP_DISABLE: 443 case IDC_METRO_SNAP_DISABLE:
444 browser_->SetMetroSnapMode(false); 444 browser_->SetMetroSnapMode(false);
445 break; 445 break;
446 case IDC_WIN8_DESKTOP_RESTART: 446 case IDC_WIN8_DESKTOP_RESTART:
447 chrome::AttemptRestartWithModeSwitch(); 447 chrome::AttemptRestartWithModeSwitch();
448 content::RecordAction(content::UserMetricsAction("Win8DesktopRestart")); 448 content::RecordAction(content::UserMetricsAction("Win8DesktopRestart"));
449 break; 449 break;
450 case IDC_WIN8_METRO_RESTART: 450 case IDC_WIN8_METRO_RESTART:
451 if (!chrome::VerifySwitchToMetroForApps(window()->GetNativeWindow())) 451 if (!VerifySwitchToMetroForApps(window()->GetNativeWindow()))
452 break; 452 break;
453 453
454 // SwitchToMetroUIHandler deletes itself. 454 // SwitchToMetroUIHandler deletes itself.
455 new SwitchToMetroUIHandler; 455 new SwitchToMetroUIHandler;
456 content::RecordAction(content::UserMetricsAction("Win8MetroRestart")); 456 content::RecordAction(content::UserMetricsAction("Win8MetroRestart"));
457 break; 457 break;
458 #endif 458 #endif
459 459
460 #if defined(OS_MACOSX) 460 #if defined(OS_MACOSX)
461 case IDC_PRESENTATION_MODE: 461 case IDC_PRESENTATION_MODE:
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 1236
1237 BrowserWindow* BrowserCommandController::window() { 1237 BrowserWindow* BrowserCommandController::window() {
1238 return browser_->window(); 1238 return browser_->window();
1239 } 1239 }
1240 1240
1241 Profile* BrowserCommandController::profile() { 1241 Profile* BrowserCommandController::profile() {
1242 return browser_->profile(); 1242 return browser_->profile();
1243 } 1243 }
1244 1244
1245 } // namespace chrome 1245 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/apps/apps_metro_handler_win.cc ('k') | chrome/browser/ui/extensions/app_metro_infobar_delegate_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698