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

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

Issue 13139004: Deprecate Browser::TYPE_PANEL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 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 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_commands.h" 5 #include "chrome/browser/ui/browser_commands.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 int index = browser->tab_strip_model()->GetIndexOfWebContents(contents); 581 int index = browser->tab_strip_model()->GetIndexOfWebContents(contents);
582 pinned = browser->tab_strip_model()->IsTabPinned(index); 582 pinned = browser->tab_strip_model()->IsTabPinned(index);
583 int add_types = TabStripModel::ADD_ACTIVE | 583 int add_types = TabStripModel::ADD_ACTIVE |
584 TabStripModel::ADD_INHERIT_GROUP | 584 TabStripModel::ADD_INHERIT_GROUP |
585 (pinned ? TabStripModel::ADD_PINNED : 0); 585 (pinned ? TabStripModel::ADD_PINNED : 0);
586 browser->tab_strip_model()->InsertWebContentsAt( 586 browser->tab_strip_model()->InsertWebContentsAt(
587 index + 1, contents_dupe, add_types); 587 index + 1, contents_dupe, add_types);
588 } else { 588 } else {
589 Browser* new_browser = NULL; 589 Browser* new_browser = NULL;
590 if (browser->is_app() && 590 if (browser->is_app() &&
591 !browser->is_type_popup() && 591 !browser->is_type_popup()) {
592 !browser->is_type_panel()) {
593 new_browser = new Browser( 592 new_browser = new Browser(
594 Browser::CreateParams::CreateForApp(browser->type(), 593 Browser::CreateParams::CreateForApp(browser->type(),
595 browser->app_name(), 594 browser->app_name(),
596 gfx::Rect(), 595 gfx::Rect(),
597 browser->profile(), 596 browser->profile(),
598 browser->host_desktop_type())); 597 browser->host_desktop_type()));
599 } else { 598 } else {
600 new_browser = new Browser( 599 new_browser = new Browser(
601 Browser::CreateParams(browser->type(), browser->profile(), 600 Browser::CreateParams(browser->type(), browser->profile(),
602 browser->host_desktop_type())); 601 browser->host_desktop_type()));
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
1097 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(), 1096 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(),
1098 browser->host_desktop_type())); 1097 browser->host_desktop_type()));
1099 app_browser->tab_strip_model()->AppendWebContents(contents, true); 1098 app_browser->tab_strip_model()->AppendWebContents(contents, true);
1100 1099
1101 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 1100 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
1102 contents->GetRenderViewHost()->SyncRendererPrefs(); 1101 contents->GetRenderViewHost()->SyncRendererPrefs();
1103 app_browser->window()->Show(); 1102 app_browser->window()->Show();
1104 } 1103 }
1105 1104
1106 } // namespace chrome 1105 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_command_controller_unittest.cc ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698