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

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

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 3 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 (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/chrome_pages.h" 5 #include "chrome/browser/ui/chrome_pages.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 break; 97 break;
98 case HELP_SOURCE_MENU: 98 case HELP_SOURCE_MENU:
99 app_launch_source = extensions::SOURCE_SYSTEM_TRAY; 99 app_launch_source = extensions::SOURCE_SYSTEM_TRAY;
100 break; 100 break;
101 case HELP_SOURCE_WEBUI: 101 case HELP_SOURCE_WEBUI:
102 app_launch_source = extensions::SOURCE_ABOUT_PAGE; 102 app_launch_source = extensions::SOURCE_ABOUT_PAGE;
103 break; 103 break;
104 default: 104 default:
105 NOTREACHED() << "Unhandled help source" << source; 105 NOTREACHED() << "Unhandled help source" << source;
106 } 106 }
107 OpenApplication( 107 OpenApplication(AppLaunchParams(
108 AppLaunchParams(profile, extension, 108 profile, extension,
109 extensions::GetLaunchContainer( 109 extensions::GetLaunchContainer(extensions::ExtensionPrefs::Get(profile),
110 extensions::ExtensionPrefs::Get(profile), extension), 110 extension),
111 NEW_FOREGROUND_TAB, app_launch_source, true)); 111 WindowOpenDisposition::NEW_FOREGROUND_TAB, app_launch_source, true));
112 #else 112 #else
113 GURL url; 113 GURL url;
114 switch (source) { 114 switch (source) {
115 case HELP_SOURCE_KEYBOARD: 115 case HELP_SOURCE_KEYBOARD:
116 url = GURL(kChromeHelpViaKeyboardURL); 116 url = GURL(kChromeHelpViaKeyboardURL);
117 break; 117 break;
118 case HELP_SOURCE_MENU: 118 case HELP_SOURCE_MENU:
119 url = GURL(kChromeHelpViaMenuURL); 119 url = GURL(kChromeHelpViaMenuURL);
120 break; 120 break;
121 case HELP_SOURCE_WEBUI: 121 case HELP_SOURCE_WEBUI:
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 SigninManagerFactory::GetForProfile(original_profile); 396 SigninManagerFactory::GetForProfile(original_profile);
397 DCHECK(manager->IsSigninAllowed()); 397 DCHECK(manager->IsSigninAllowed());
398 if (manager->IsAuthenticated()) 398 if (manager->IsAuthenticated())
399 ShowSettings(browser); 399 ShowSettings(browser);
400 else 400 else
401 ShowBrowserSignin(browser, access_point); 401 ShowBrowserSignin(browser, access_point);
402 } 402 }
403 #endif 403 #endif
404 404
405 } // namespace chrome 405 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_tabstrip.cc ('k') | chrome/browser/ui/cocoa/applescript/tab_applescript.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698